diff options
| author | Paolo Bonzini | 2013-06-07 03:25:08 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2013-07-04 17:42:47 +0200 |
| commit | b716368778aebdb523546d72a28706420a8c32ae (patch) | |
| tree | 184134482e43ec9643448ffd41e2503efb3e5130 /hw/gpio/omap_gpio.c | |
| parent | hw/d*: pass owner to memory_region_init* functions (diff) | |
| download | qemu-b716368778aebdb523546d72a28706420a8c32ae.tar.gz qemu-b716368778aebdb523546d72a28706420a8c32ae.tar.xz qemu-b716368778aebdb523546d72a28706420a8c32ae.zip | |
hw/gpio: pass owner to memory_region_init* functions
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/gpio/omap_gpio.c')
| -rw-r--r-- | hw/gpio/omap_gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 13399f9a12..855afae6bb 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -677,7 +677,7 @@ static int omap_gpio_init(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, omap_gpio_set, 16); qdev_init_gpio_out(&dev->qdev, s->omap1.handler, 16); sysbus_init_irq(dev, &s->omap1.irq); - memory_region_init_io(&s->iomem, NULL, &omap_gpio_ops, &s->omap1, + memory_region_init_io(&s->iomem, OBJECT(s), &omap_gpio_ops, &s->omap1, "omap.gpio", 0x1000); sysbus_init_mmio(dev, &s->iomem); return 0; @@ -692,7 +692,7 @@ static int omap2_gpio_init(SysBusDevice *dev) } if (s->mpu_model < omap3430) { s->modulecount = (s->mpu_model < omap2430) ? 4 : 5; - memory_region_init_io(&s->iomem, NULL, &omap2_gpif_top_ops, s, + memory_region_init_io(&s->iomem, OBJECT(s), &omap2_gpif_top_ops, s, "omap2.gpio", 0x1000); sysbus_init_mmio(dev, &s->iomem); } else { @@ -712,7 +712,7 @@ static int omap2_gpio_init(SysBusDevice *dev) sysbus_init_irq(dev, &m->irq[0]); /* mpu irq */ sysbus_init_irq(dev, &m->irq[1]); /* dsp irq */ sysbus_init_irq(dev, &m->wkup); - memory_region_init_io(&m->iomem, NULL, &omap2_gpio_module_ops, m, + memory_region_init_io(&m->iomem, OBJECT(s), &omap2_gpio_module_ops, m, "omap.gpio-module", 0x1000); sysbus_init_mmio(dev, &m->iomem); } |