haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

misc: zynq_slcr: Convert SBD::init to object init

Browse source 
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>
This commit is contained in:
Peter Crosthwaite 2014-04-15 19:49:11 +01:00 committed by Peter Maydell
parent db302f8f93
commit 15e3611e1c
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
hw/misc/zynq_slcr.c
View file

@ -413,15 +413,13 @@ static const MemoryRegionOps slcr_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .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); ZYNQ_SLCR_MMIO_SIZE);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);
return 0;
} }
static const VMStateDescription vmstate_zynq_slcr = { 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) static void zynq_slcr_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
sdc->init = zynq_slcr_init;
dc->vmsd = &vmstate_zynq_slcr; dc->vmsd = &vmstate_zynq_slcr;
dc->reset = zynq_slcr_reset; dc->reset = zynq_slcr_reset;
} }
@ -450,6 +446,7 @@ static const TypeInfo zynq_slcr_info = {
.name = TYPE_ZYNQ_SLCR, .name = TYPE_ZYNQ_SLCR,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ZynqSLCRState), .instance_size = sizeof(ZynqSLCRState),
.instance_init = zynq_slcr_init,
}; };
static void zynq_slcr_register_types(void) static void zynq_slcr_register_types(void)