diff options
| author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2014-04-15 19:49:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-17 21:34:07 +0100 |
| commit | 15e3611e1ca7a3b4d2cee505df83ea2744c2874d (patch) | |
| tree | e42cb12196dce05f5a753f0ebd0f426b066a702e /hw/misc/zynq_slcr.c | |
| parent | db302f8f9364580a90b383d8531d28500e4e5bb5 (diff) | |
| download | qemu-15e3611e1ca7a3b4d2cee505df83ea2744c2874d.zip qemu-15e3611e1ca7a3b4d2cee505df83ea2744c2874d.tar.gz qemu-15e3611e1ca7a3b4d2cee505df83ea2744c2874d.tar.bz2 | |
misc: zynq_slcr: Convert SBD::init to object init
To bring it up to date with styling guidelines.
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 2e837af80a18216c21e73241032e048f39d78b99.1396503037.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/zynq_slcr.c')
| -rw-r--r-- | hw/misc/zynq_slcr.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index cc29444..06eba08 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -413,15 +413,13 @@ static const MemoryRegionOps slcr_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int zynq_slcr_init(SysBusDevice *dev) +static void zynq_slcr_init(Object *obj) { - ZynqSLCRState *s = ZYNQ_SLCR(dev); + ZynqSLCRState *s = ZYNQ_SLCR(obj); - memory_region_init_io(&s->iomem, OBJECT(s), &slcr_ops, s, "slcr", + memory_region_init_io(&s->iomem, obj, &slcr_ops, s, "slcr", ZYNQ_SLCR_MMIO_SIZE); - sysbus_init_mmio(dev, &s->iomem); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem); } static const VMStateDescription vmstate_zynq_slcr = { @@ -438,9 +436,7 @@ static const VMStateDescription vmstate_zynq_slcr = { static void zynq_slcr_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); - sdc->init = zynq_slcr_init; dc->vmsd = &vmstate_zynq_slcr; dc->reset = zynq_slcr_reset; } @@ -450,6 +446,7 @@ static const TypeInfo zynq_slcr_info = { .name = TYPE_ZYNQ_SLCR, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(ZynqSLCRState), + .instance_init = zynq_slcr_init, }; static void zynq_slcr_register_types(void) |