From: Mao Zhongyi Date: Mon, 22 Oct 2018 07:40:50 +0000 (+0800) Subject: audio: use TYPE_MV88W8618_AUDIO instead of hardcoded string X-Git-Tag: v3.1.0-rc0~29^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d436d4e7a50a7c4fddc0569c2107fe5eaf0e1fbc;p=thirdparty%2Fqemu.git audio: use TYPE_MV88W8618_AUDIO instead of hardcoded string Cc: Jan Kiszka Cc: Philippe Mathieu-Daudé Cc: Peter Maydell Signed-off-by: Mao Zhongyi Reviewed-by: Philippe Mathieu-Daudé Message-id: 20181022074050.19638-4-maozhongyi@cmss.chinamobile.com Signed-off-by: Gerd Hoffmann --- diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index ac266f9253e..9648b3af44e 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 1c7080e8446..6600ab48516 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 84e7a119bbf..e12cb886d16 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);