Signed-off-by: Anthony Liguori <aligu...@us.ibm.com>
[AF: Use DEFINE_PROP_END_OF_LIST() as well]
Signed-off-by: Andreas Färber <afaer...@suse.de>
---
If we're touching it, let's do it right. Causes a trivial merge conflict
in [PATCH 27/28] sysbus: apic: ioapic: convert to QEMU Object Model.
hw/marvell_88w8618_audio.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c
index 0cd8410..8b6a5c0 100644
--- a/hw/marvell_88w8618_audio.c
+++ b/hw/marvell_88w8618_audio.c
@@ -50,7 +50,7 @@ typedef struct mv88w8618_audio_state {
uint32_t play_pos;
uint32_t last_free;
uint32_t clock_div;
- DeviceState *wm;
+ void *wm;
} mv88w8618_audio_state;
static void mv88w8618_audio_callback(void *opaque, int free_out, int free_in)
@@ -279,12 +279,8 @@ static SysBusDeviceInfo mv88w8618_audio_info = {
.qdev.reset = mv88w8618_audio_reset,
.qdev.vmsd = &mv88w8618_audio_vmsd,
.qdev.props = (Property[]) {
- {
- .name = "wm8750",
- .info = &qdev_prop_ptr,
- .offset = offsetof(mv88w8618_audio_state, wm),
- },
- {/* end of list */}
+ DEFINE_PROP_PTR("wm8750", mv88w8618_audio_state, wm),
+ DEFINE_PROP_END_OF_LIST()
}
};
--
1.7.7
