aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMao Zhongyi <maozhongyi@cmss.chinamobile.com>2018-10-22 15:40:50 +0800
committerGerd Hoffmann <kraxel@redhat.com>2018-10-29 13:50:15 +0100
commitd436d4e7a50a7c4fddc0569c2107fe5eaf0e1fbc (patch)
tree6aa330bb37a81db05357aa162a4b0ed23923ffd7
parenta8299ec1b243ea56c41648ca63b96930f2db118b (diff)
downloadqemu-d436d4e7a50a7c4fddc0569c2107fe5eaf0e1fbc.zip
qemu-d436d4e7a50a7c4fddc0569c2107fe5eaf0e1fbc.tar.gz
qemu-d436d4e7a50a7c4fddc0569c2107fe5eaf0e1fbc.tar.bz2
audio: use TYPE_MV88W8618_AUDIO instead of hardcoded string
Cc: Jan Kiszka <jan.kiszka@web.de> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20181022074050.19638-4-maozhongyi@cmss.chinamobile.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/arm/musicpal.c2
-rw-r--r--hw/audio/marvell_88w8618.c1
-rw-r--r--include/hw/audio/wm8750.h1
3 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index ac266f9..9648b3a 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -1693,7 +1693,7 @@ static void musicpal_init(MachineState *machine)
}
wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR);
- dev = qdev_create(NULL, "mv88w8618_audio");
+ dev = qdev_create(NULL, TYPE_MV88W8618_AUDIO);
s = SYS_BUS_DEVICE(dev);
object_property_set_link(OBJECT(dev), OBJECT(wm8750_dev),
TYPE_WM8750, NULL);
diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index 1c7080e..6600ab4 100644
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -39,7 +39,6 @@
#define MP_AUDIO_CLOCK_24MHZ (1 << 9)
#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)
diff --git a/include/hw/audio/wm8750.h b/include/hw/audio/wm8750.h
index 84e7a11..e12cb88 100644
--- a/include/hw/audio/wm8750.h
+++ b/include/hw/audio/wm8750.h
@@ -17,6 +17,7 @@
#include "hw/hw.h"
#define TYPE_WM8750 "wm8750"
+#define TYPE_MV88W8618_AUDIO "mv88w8618_audio"
typedef void data_req_cb(void *opaque, int free_out, int free_in);