[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 166/173] exynos4210_i2c: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 166/173] exynos4210_i2c: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:20:23 +0200 |
Fix one ->qdev access and rename parent field.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/i2c/exynos4210_i2c.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c
index 42f5e89..ce5f849 100644
--- a/hw/i2c/exynos4210_i2c.c
+++ b/hw/i2c/exynos4210_i2c.c
@@ -80,7 +80,8 @@ static const char *exynos4_i2c_get_regname(unsigned offset)
#endif
typedef struct Exynos4210I2CState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
i2c_bus *bus;
qemu_irq irq;
@@ -297,15 +298,16 @@ static void exynos4210_i2c_reset(DeviceState *d)
s->scl_free = true;
}
-static int exynos4210_i2c_realize(SysBusDevice *dev)
+static int exynos4210_i2c_realize(SysBusDevice *sbd)
{
+ DeviceState *dev = DEVICE(sbd);
Exynos4210I2CState *s = EXYNOS4_I2C(dev);
memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_i2c_ops, s,
TYPE_EXYNOS4_I2C, EXYNOS4_I2C_MEM_SIZE);
- sysbus_init_mmio(dev, &s->iomem);
- sysbus_init_irq(dev, &s->irq);
- s->bus = i2c_init_bus(&dev->qdev, "i2c");
+ sysbus_init_mmio(sbd, &s->iomem);
+ sysbus_init_irq(sbd, &s->irq);
+ s->bus = i2c_init_bus(dev, "i2c");
return 0;
}
--
1.8.1.4
- [Qemu-devel] [PULL 173/173] sysbus: QOM parent field cleanup for SysBusDevice, (continued)
- [Qemu-devel] [PULL 173/173] sysbus: QOM parent field cleanup for SysBusDevice, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 169/173] kvmvapic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 168/173] mipsnet: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 118/173] cadence_gem: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 171/173] ioapic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 122/173] lance: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 170/173] kvm/ioapic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 100/173] pl190: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 101/173] puv3_intc: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 117/173] zynq_slcr: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 166/173] exynos4210_i2c: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PULL 102/173] realview_gic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 120/173] etraxfs_eth: Rename fs_eth to ETRAXFSEthState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 104/173] xilinx_intc: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 098/173] omap_intc: QOM'ify omap-intc and omap2-intc, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 121/173] lan9118: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 167/173] opencores_eth: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 119/173] etraxfs_eth: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 172/173] spapr_pci: QOM cast cleanup, Andreas Färber, 2013/07/29