audio/marvell_88w8618: QOM cast cleanup

Introduce a type constant, use QOM casts and rename the parent field.

Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
master
Andreas Färber 2013-07-24 10:10:44 +02:00
parent f9e7419039
commit 9e3f8599fc
1 changed files with 9 additions and 5 deletions

View File

@ -36,8 +36,13 @@
#define MP_AUDIO_CLOCK_24MHZ (1 << 9) #define MP_AUDIO_CLOCK_24MHZ (1 << 9)
#define MP_AUDIO_MONO (1 << 14) #define MP_AUDIO_MONO (1 << 14)
#define TYPE_MV88W8618_AUDIO "mv88w8618_audio"
#define MV88W8618_AUDIO(obj) \
OBJECT_CHECK(mv88w8618_audio_state, (obj), TYPE_MV88W8618_AUDIO)
typedef struct mv88w8618_audio_state { typedef struct mv88w8618_audio_state {
SysBusDevice busdev; SysBusDevice parent_obj;
MemoryRegion iomem; MemoryRegion iomem;
qemu_irq irq; qemu_irq irq;
uint32_t playback_mode; uint32_t playback_mode;
@ -219,8 +224,7 @@ static void mv88w8618_audio_write(void *opaque, hwaddr offset,
static void mv88w8618_audio_reset(DeviceState *d) static void mv88w8618_audio_reset(DeviceState *d)
{ {
mv88w8618_audio_state *s = FROM_SYSBUS(mv88w8618_audio_state, mv88w8618_audio_state *s = MV88W8618_AUDIO(d);
SYS_BUS_DEVICE(d));
s->playback_mode = 0; s->playback_mode = 0;
s->status = 0; s->status = 0;
@ -238,7 +242,7 @@ static const MemoryRegionOps mv88w8618_audio_ops = {
static int mv88w8618_audio_init(SysBusDevice *dev) static int mv88w8618_audio_init(SysBusDevice *dev)
{ {
mv88w8618_audio_state *s = FROM_SYSBUS(mv88w8618_audio_state, dev); mv88w8618_audio_state *s = MV88W8618_AUDIO(dev);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
@ -287,7 +291,7 @@ static void mv88w8618_audio_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo mv88w8618_audio_info = { static const TypeInfo mv88w8618_audio_info = {
.name = "mv88w8618_audio", .name = TYPE_MV88W8618_AUDIO,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(mv88w8618_audio_state), .instance_size = sizeof(mv88w8618_audio_state),
.class_init = mv88w8618_audio_class_init, .class_init = mv88w8618_audio_class_init,