Message ID | 4F3D3EF2.4090503@mentor.com |
---|---|
State | New |
Headers | show |
On 16 February 2012 17:37, Alexander Barabash <alexander_barabash@mentor.com> wrote: > > Removed unused arm_sysctl_init(). > Renamed arm_sysctl_init1() into arm_sysctl_init(). > > Signed-off-by: Alexander Barabash <alexander_barabash@mentor.com> This also is textually identical to a patch I just submitted this week. Are you sure you aren't somehow laundering other peoples' patches and resubmitting them? Anyway, please don't commit to qemu-trivial, this is in arm-devs.next. -- PMM
Am 16.02.2012 18:37, schrieb Alexander Barabash: > > Removed unused arm_sysctl_init(). > Renamed arm_sysctl_init1() into arm_sysctl_init(). > > Signed-off-by: Alexander Barabash <alexander_barabash@mentor.com> This I believe I already reviewed in a patchset from Peter. Not "trivial" but ARM. Andreas > > diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c > index 149c639..5f1237b 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 ded0446..7337c3b 100644 > --- a/hw/primecell.h > +++ b/hw/primecell.h > @@ -5,9 +5,6 @@ > /* Also includes some devices that are currently only used by the > ARM boards. */ > > -/* 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
On 16 February 2012 18:18, Peter Maydell <peter.maydell@linaro.org> wrote: > On 16 February 2012 17:37, Alexander Barabash > <alexander_barabash@mentor.com> wrote: >> >> Removed unused arm_sysctl_init(). >> Renamed arm_sysctl_init1() into arm_sysctl_init(). >> >> Signed-off-by: Alexander Barabash <alexander_barabash@mentor.com> > > This also is textually identical to a patch I just submitted > this week. Are you sure you aren't somehow laundering other > peoples' patches and resubmitting them? For the avoidance of doubt, this last sentence should have included the word "accidentally": it is a suggestion your workflow might be broken, not an accusation. -- PMM
diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c index 149c639..5f1237b 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 ded0446..7337c3b 100644 --- a/hw/primecell.h +++ b/hw/primecell.h @@ -5,9 +5,6 @@ /* Also includes some devices that are currently only used by the ARM boards. */ -/* 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
Removed unused arm_sysctl_init(). Renamed arm_sysctl_init1() into arm_sysctl_init(). Signed-off-by: Alexander Barabash <alexander_barabash@mentor.com>