audio: use object link instead of qdev property to pass wm8750 reference
According to qdev-properties.h, properties of pointer type should be avoided, it seems a link type property is a good substitution. Cc: Jan Kiszka <jan.kiszka@web.de> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20181022074050.19638-3-maozhongyi@cmss.chinamobile.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
a518333b15
commit
a8299ec1b2
|
@ -1695,7 +1695,8 @@ static void musicpal_init(MachineState *machine)
|
||||||
wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR);
|
wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR);
|
||||||
dev = qdev_create(NULL, "mv88w8618_audio");
|
dev = qdev_create(NULL, "mv88w8618_audio");
|
||||||
s = SYS_BUS_DEVICE(dev);
|
s = SYS_BUS_DEVICE(dev);
|
||||||
qdev_prop_set_ptr(dev, TYPE_WM8750, wm8750_dev);
|
object_property_set_link(OBJECT(dev), OBJECT(wm8750_dev),
|
||||||
|
TYPE_WM8750, NULL);
|
||||||
qdev_init_nofail(dev);
|
qdev_init_nofail(dev);
|
||||||
sysbus_mmio_map(s, 0, MP_AUDIO_BASE);
|
sysbus_mmio_map(s, 0, MP_AUDIO_BASE);
|
||||||
sysbus_connect_irq(s, 0, pic[MP_AUDIO_IRQ]);
|
sysbus_connect_irq(s, 0, pic[MP_AUDIO_IRQ]);
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include "hw/i2c/i2c.h"
|
#include "hw/i2c/i2c.h"
|
||||||
#include "hw/audio/wm8750.h"
|
#include "hw/audio/wm8750.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
|
#include "qapi/error.h"
|
||||||
|
|
||||||
#define MP_AUDIO_SIZE 0x00001000
|
#define MP_AUDIO_SIZE 0x00001000
|
||||||
|
|
||||||
|
@ -252,6 +253,11 @@ static void mv88w8618_audio_init(Object *obj)
|
||||||
memory_region_init_io(&s->iomem, obj, &mv88w8618_audio_ops, s,
|
memory_region_init_io(&s->iomem, obj, &mv88w8618_audio_ops, s,
|
||||||
"audio", MP_AUDIO_SIZE);
|
"audio", MP_AUDIO_SIZE);
|
||||||
sysbus_init_mmio(dev, &s->iomem);
|
sysbus_init_mmio(dev, &s->iomem);
|
||||||
|
|
||||||
|
object_property_add_link(OBJECT(dev), "wm8750", TYPE_WM8750,
|
||||||
|
(Object **) &s->wm,
|
||||||
|
qdev_prop_allow_set_link_before_realize,
|
||||||
|
0, &error_abort);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mv88w8618_audio_realize(DeviceState *dev, Error **errp)
|
static void mv88w8618_audio_realize(DeviceState *dev, Error **errp)
|
||||||
|
@ -279,11 +285,6 @@ static const VMStateDescription mv88w8618_audio_vmsd = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
static Property mv88w8618_audio_properties[] = {
|
|
||||||
DEFINE_PROP_PTR(TYPE_WM8750, mv88w8618_audio_state, wm),
|
|
||||||
{/* end of list */},
|
|
||||||
};
|
|
||||||
|
|
||||||
static void mv88w8618_audio_class_init(ObjectClass *klass, void *data)
|
static void mv88w8618_audio_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
@ -291,8 +292,6 @@ static void mv88w8618_audio_class_init(ObjectClass *klass, void *data)
|
||||||
dc->realize = mv88w8618_audio_realize;
|
dc->realize = mv88w8618_audio_realize;
|
||||||
dc->reset = mv88w8618_audio_reset;
|
dc->reset = mv88w8618_audio_reset;
|
||||||
dc->vmsd = &mv88w8618_audio_vmsd;
|
dc->vmsd = &mv88w8618_audio_vmsd;
|
||||||
dc->props = mv88w8618_audio_properties;
|
|
||||||
/* Reason: pointer property "wm8750" */
|
|
||||||
dc->user_creatable = false;
|
dc->user_creatable = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue