diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-07-27 15:10:14 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-07-29 21:07:02 +0200 |
| commit | d3b800495ec886d45a0be7aa6eb4e1de7533968f (patch) | |
| tree | 4ff3d33235c118544a9e2316875c25d0f09cb954 | |
| parent | b91f0dfd12dbd117235409980e77523fba5f8978 (diff) | |
pl031: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | hw/timer/pl031.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index e705a69d1f..d5e2f3e265 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -33,8 +33,12 @@ do { printf("pl031: " fmt , ## __VA_ARGS__); } while (0) #define RTC_MIS 0x18 /* Masked interrupt status register */ #define RTC_ICR 0x1c /* Interrupt clear register */ +#define TYPE_PL031 "pl031" +#define PL031(obj) OBJECT_CHECK(PL031State, (obj), TYPE_PL031) + typedef struct PL031State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; QEMUTimer *timer; qemu_irq irq; @@ -189,7 +193,7 @@ static const MemoryRegionOps pl031_ops = { static int pl031_init(SysBusDevice *dev) { - PL031State *s = FROM_SYSBUS(PL031State, dev); + PL031State *s = PL031(dev); struct tm tm; memory_region_init_io(&s->iomem, OBJECT(s), &pl031_ops, s, "pl031", 0x1000); @@ -251,7 +255,7 @@ static void pl031_class_init(ObjectClass *klass, void *data) } static const TypeInfo pl031_info = { - .name = "pl031", + .name = TYPE_PL031, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(PL031State), .class_init = pl031_class_init, |