From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:51378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5IAX-0006P6-3m for qemu-devel@nongnu.org; Sun, 18 Sep 2011 10:16:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5IAV-0007da-27 for qemu-devel@nongnu.org; Sun, 18 Sep 2011 10:16:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5IAU-0007cx-6z for qemu-devel@nongnu.org; Sun, 18 Sep 2011 10:16:26 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8IEGPXx029844 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 18 Sep 2011 10:16:25 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8IEGKmY015571 for ; Sun, 18 Sep 2011 10:16:24 -0400 From: Avi Kivity Date: Sun, 18 Sep 2011 17:16:02 +0300 Message-Id: <1316355364-23603-12-git-send-email-avi@redhat.com> In-Reply-To: <1316355364-23603-1-git-send-email-avi@redhat.com> References: <1316355364-23603-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 11/13] omap_lcdc: remove imif, emiff from structure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Not used. 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 25d10f3..de83452 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 f48aa8a..09eb363 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 a905422..29e6048 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, -- 1.7.6.3