The model argument to omap_dma_init() is always omap_dma_3_1, and all we do with it now is assert this; drop the argument and the enum.
Signed-off-by: Peter Maydell <[email protected]> --- hw/arm/omap1.c | 2 +- hw/dma/omap_dma.c | 8 +++----- include/hw/arm/omap.h | 12 +++--------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 80168644ce..44f9dd67c3 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -3789,7 +3789,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram, } s->dma = omap_dma_init(0xfffed800, dma_irqs, system_memory, qdev_get_gpio_in(s->ih[0], OMAP_INT_DMA_LCD), - s, omap_findclk(s, "dma_ck"), omap_dma_3_1); + s, omap_findclk(s, "dma_ck")); s->port[emiff ].addr_valid = omap_validate_emiff_addr; s->port[emifs ].addr_valid = omap_validate_emifs_addr; diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index dea251afbc..a93d9ad196 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -1075,15 +1075,13 @@ static void omap_dma_clk_update(void *opaque, int line, int on) } struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq *irqs, - MemoryRegion *sysmem, - qemu_irq lcd_irq, struct omap_mpu_state_s *mpu, omap_clk clk, - enum omap_dma_model model) + MemoryRegion *sysmem, + qemu_irq lcd_irq, + struct omap_mpu_state_s *mpu, omap_clk clk) { int num_irqs, memsize, i; struct omap_dma_s *s = g_new0(struct omap_dma_s, 1); - assert(model == omap_dma_3_1); - num_irqs = 6; memsize = 0x800; s->mpu = mpu; diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 36569815e8..2675d064f2 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -172,17 +172,11 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk); #define OMAP_INT_310_McBSP2RX_OF 31 /* omap_dma.c */ -enum omap_dma_model { - omap_dma_3_0, - omap_dma_3_1, - omap_dma_3_2, -}; - struct soc_dma_s; struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq *irqs, - MemoryRegion *sysmem, - qemu_irq lcd_irq, struct omap_mpu_state_s *mpu, omap_clk clk, - enum omap_dma_model model); + MemoryRegion *sysmem, + qemu_irq lcd_irq, + struct omap_mpu_state_s *mpu, omap_clk clk); void omap_dma_reset(struct soc_dma_s *s); struct dma_irq_map { -- 2.43.0
