From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Maksim Kozlov" <m.kozlov@samsung.com>,
"Igor Mitsyanko" <i.mitsyanko@samsung.com>,
"Andreas Färber" <afaerber@suse.de>,
"Evgeny Voevodin" <e.voevodin@samsung.com>,
"Dmitry Solodkiy" <d.solodkiy@samsung.com>
Subject: [Qemu-devel] [PATCH qom-next for-1.6 03/11] exynos4210_i2c: QOM cast cleanup
Date: Sat, 27 Jul 2013 22:19:48 +0200 [thread overview]
Message-ID: <1374956396-25586-4-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1374956396-25586-1-git-send-email-afaerber@suse.de>
Fix one ->qdev access and rename parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
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
next prev parent reply other threads:[~2013-07-27 21:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-27 20:19 [Qemu-devel] [PATCH qom-next for-1.6 00/11] sysbus: QOM cast cleanups -- plus outlook Andreas Färber
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 01/11] sysbus: Drop FROM_SYSBUS() Andreas Färber
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 02/11] sysbus: Remove unused sysbus_new() prototype Andreas Färber
2013-07-27 20:19 ` Andreas Färber [this message]
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 04/11] opencores_eth: QOM cast cleanup Andreas Färber
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 05/11] mipsnet: " Andreas Färber
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 06/11] kvmvapic: " Andreas Färber
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 07/11] kvm/ioapic: " Andreas Färber
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 08/11] ioapic: " Andreas Färber
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 09/11] mips_malta: " Andreas Färber
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 10/11] spapr_pci: " Andreas Färber
2013-07-27 20:19 ` [Qemu-devel] [PATCH qom-next for-1.6 11/11] sysbus: QOM parent field cleanup for SysBusDevice Andreas Färber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374956396-25586-4-git-send-email-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=d.solodkiy@samsung.com \
--cc=e.voevodin@samsung.com \
--cc=i.mitsyanko@samsung.com \
--cc=m.kozlov@samsung.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).