xilinx_intc: QOM cast cleanup

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-26 20:46:22 +02:00
parent 7abad863d7
commit cc3e064ee9

View File

@ -37,9 +37,13 @@
#define R_MER 7 #define R_MER 7
#define R_MAX 8 #define R_MAX 8
#define TYPE_XILINX_INTC "xlnx.xps-intc"
#define XILINX_INTC(obj) OBJECT_CHECK(struct xlx_pic, (obj), TYPE_XILINX_INTC)
struct xlx_pic struct xlx_pic
{ {
SysBusDevice busdev; SysBusDevice parent_obj;
MemoryRegion mmio; MemoryRegion mmio;
qemu_irq parent_irq; qemu_irq parent_irq;
@ -153,16 +157,17 @@ static void irq_handler(void *opaque, int irq, int level)
update_irq(p); update_irq(p);
} }
static int xilinx_intc_init(SysBusDevice *dev) static int xilinx_intc_init(SysBusDevice *sbd)
{ {
struct xlx_pic *p = FROM_SYSBUS(typeof (*p), dev); DeviceState *dev = DEVICE(sbd);
struct xlx_pic *p = XILINX_INTC(dev);
qdev_init_gpio_in(&dev->qdev, irq_handler, 32); qdev_init_gpio_in(dev, irq_handler, 32);
sysbus_init_irq(dev, &p->parent_irq); sysbus_init_irq(sbd, &p->parent_irq);
memory_region_init_io(&p->mmio, OBJECT(p), &pic_ops, p, "xlnx.xps-intc", memory_region_init_io(&p->mmio, OBJECT(p), &pic_ops, p, "xlnx.xps-intc",
R_MAX * 4); R_MAX * 4);
sysbus_init_mmio(dev, &p->mmio); sysbus_init_mmio(sbd, &p->mmio);
return 0; return 0;
} }
@ -181,7 +186,7 @@ static void xilinx_intc_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo xilinx_intc_info = { static const TypeInfo xilinx_intc_info = {
.name = "xlnx.xps-intc", .name = TYPE_XILINX_INTC,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(struct xlx_pic), .instance_size = sizeof(struct xlx_pic),
.class_init = xilinx_intc_class_init, .class_init = xilinx_intc_class_init,