From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvNyJ-0003YX-Bn for qemu-devel@nongnu.org; Thu, 09 Feb 2012 01:59:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvNyI-0007su-BV for qemu-devel@nongnu.org; Thu, 09 Feb 2012 01:59:11 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:60291) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvNyI-0007sp-2w for qemu-devel@nongnu.org; Thu, 09 Feb 2012 01:59:10 -0500 From: Peter Maydell Date: Thu, 9 Feb 2012 06:59:07 +0000 Message-Id: <1328770747-660-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] hw/arm_sysctl: Drop legacy init function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org Drop the legacy init function arm_sysctl_init(), since it has no users left any more. This allows us to drop the awkward '1' from the actual device init function. Signed-off-by: Peter Maydell --- The legacy function also had the 'set property after init' bug (in fact this is the original source for the copy-n-pasted bits of code in the board init functions). However since nobody's using it we might as well get rid of it rather than correcting it... hw/arm_sysctl.c | 16 ++-------------- hw/primecell.h | 3 --- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c index 9d25799..7754864 100644 --- a/hw/arm_sysctl.c +++ b/hw/arm_sysctl.c @@ -378,7 +378,7 @@ static void arm_sysctl_gpio_set(void *opaque, int line, int level) } } -static int arm_sysctl_init1(SysBusDevice *dev) +static int arm_sysctl_init(SysBusDevice *dev) { arm_sysctl_state *s = FROM_SYSBUS(arm_sysctl_state, dev); @@ -389,18 +389,6 @@ static int arm_sysctl_init1(SysBusDevice *dev) return 0; } -/* Legacy helper function. */ -void arm_sysctl_init(uint32_t base, uint32_t sys_id, uint32_t proc_id) -{ - DeviceState *dev; - - dev = qdev_create(NULL, "realview_sysctl"); - qdev_prop_set_uint32(dev, "sys_id", sys_id); - qdev_init_nofail(dev); - qdev_prop_set_uint32(dev, "proc_id", proc_id); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); -} - static Property arm_sysctl_properties[] = { DEFINE_PROP_UINT32("sys_id", arm_sysctl_state, sys_id, 0), DEFINE_PROP_UINT32("proc_id", arm_sysctl_state, proc_id, 0), @@ -412,7 +400,7 @@ static void arm_sysctl_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = arm_sysctl_init1; + k->init = arm_sysctl_init; dc->reset = arm_sysctl_reset; dc->vmsd = &vmstate_arm_sysctl; dc->props = arm_sysctl_properties; diff --git a/hw/primecell.h b/hw/primecell.h index de7d6f2..e709ad3 100644 --- a/hw/primecell.h +++ b/hw/primecell.h @@ -8,9 +8,6 @@ /* pl080.c */ void *pl080_init(uint32_t base, qemu_irq irq, int nchannels); -/* arm_sysctl.c */ -void arm_sysctl_init(uint32_t base, uint32_t sys_id, uint32_t proc_id); - /* arm_sysctl GPIO lines */ #define ARM_SYSCTL_GPIO_MMC_WPROT 0 #define ARM_SYSCTL_GPIO_MMC_CARDIN 1 -- 1.7.5.4