From 9898b79abe32c5521ef365207d8a1db6c3a6e206 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 30 Aug 2011 11:56:30 +0300 Subject: [PATCH] omap_lcdc: remove imif, emiff from structure Not used. Acked-by: Peter Maydell Signed-off-by: Avi Kivity --- hw/omap.h | 3 +-- hw/omap1.c | 3 +-- hw/omap_lcdc.c | 7 +------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/hw/omap.h b/hw/omap.h index 25d10f31f3..de83452572 100644 --- a/hw/omap.h +++ b/hw/omap.h @@ -744,8 +744,7 @@ void omap_tap_init(struct omap_target_agent_s *ta, struct omap_lcd_panel_s; void omap_lcdc_reset(struct omap_lcd_panel_s *s); struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq, - struct omap_dma_lcd_channel_s *dma, - ram_addr_t imif_base, ram_addr_t emiff_base, omap_clk clk); + struct omap_dma_lcd_channel_s *dma, omap_clk clk); /* omap_dss.c */ struct rfbi_chip_s { diff --git a/hw/omap1.c b/hw/omap1.c index f48aa8af4e..09eb363cbc 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -3872,8 +3872,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, omap_findclk(s, "clk32-kHz")); s->lcd = omap_lcdc_init(0xfffec000, s->irq[0][OMAP_INT_LCD_CTRL], - omap_dma_get_lcdch(s->dma), imif_base, emiff_base, - omap_findclk(s, "lcd_ck")); + omap_dma_get_lcdch(s->dma), omap_findclk(s, "lcd_ck")); omap_ulpd_pm_init(system_memory, 0xfffe0800, s); omap_pin_cfg_init(system_memory, 0xfffe1000, s); diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index a9054227e2..29e604863d 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -24,8 +24,6 @@ struct omap_lcd_panel_s { qemu_irq irq; DisplayState *state; - ram_addr_t imif_base; - ram_addr_t emiff_base; int plm; int tft; @@ -436,8 +434,7 @@ void omap_lcdc_reset(struct omap_lcd_panel_s *s) } struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq, - struct omap_dma_lcd_channel_s *dma, - ram_addr_t imif_base, ram_addr_t emiff_base, omap_clk clk) + struct omap_dma_lcd_channel_s *dma, omap_clk clk) { int iomemtype; struct omap_lcd_panel_s *s = (struct omap_lcd_panel_s *) @@ -445,8 +442,6 @@ struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq, s->irq = irq; s->dma = dma; - s->imif_base = imif_base; - s->emiff_base = emiff_base; omap_lcdc_reset(s); iomemtype = cpu_register_io_memory(omap_lcdc_readfn,