From patchwork Thu Oct 11 09:00:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mao Zhongyi X-Patchwork-Id: 982359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cmss.chinamobile.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42W4ps189lz9sjF for ; Thu, 11 Oct 2018 20:06:59 +1100 (AEDT) Received: from localhost ([::1]:33061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWvn-0002aX-Qr for incoming@patchwork.ozlabs.org; Thu, 11 Oct 2018 05:06:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWq2-0007l9-21 for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:01:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAWpk-0005c9-Cu for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:00:57 -0400 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:54544) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWpj-0005bZ-NA for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:00:40 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.13]) by rmmx-syy-dmz-app11-12011 (RichMail) with SMTP id 2eeb5bbf1136033-01c54; Thu, 11 Oct 2018 17:00:38 +0800 (CST) X-RM-TRANSID: 2eeb5bbf1136033-01c54 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from maozy-host.lan (unknown[112.25.154.149]) by rmsmtp-syy-appsvr07-12007 (RichMail) with SMTP id 2ee75bbf111afd5-16ab1; Thu, 11 Oct 2018 17:00:38 +0800 (CST) X-RM-TRANSID: 2ee75bbf111afd5-16ab1 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Thu, 11 Oct 2018 17:00:07 +0800 Message-Id: <20181011090007.1103-5-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181011090007.1103-1-maozhongyi@cmss.chinamobile.com> References: <20181011090007.1103-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH 4/4] audio: use existing macros istead of hardcoded strings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jan Kiszka , Gerd Hoffmann , Mao Zhongyi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Cc: Jan Kiszka Cc: Peter Maydell Cc: Gerd Hoffmann To: qemu-arm@nongnu.org Signed-off-by: Mao Zhongyi --- hw/arm/musicpal.c | 16 ++++++++-------- hw/audio/marvell_88w8618.c | 3 +-- include/hw/audio/wm8750.h | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index ac266f9253..6425f1d50f 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -406,7 +406,7 @@ static void mv88w8618_eth_realize(DeviceState *dev, Error **errp) } static const VMStateDescription mv88w8618_eth_vmsd = { - .name = "mv88w8618_eth", + .name = TYPE_MV88W8618_ETH, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -645,7 +645,7 @@ static void musicpal_lcd_init(Object *obj) } static const VMStateDescription musicpal_lcd_vmsd = { - .name = "musicpal_lcd", + .name = TYPE_MUSICPAL_LCD, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -771,7 +771,7 @@ static void mv88w8618_pic_init(Object *obj) } static const VMStateDescription mv88w8618_pic_vmsd = { - .name = "mv88w8618_pic", + .name = TYPE_MV88W8618_PIC, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -951,7 +951,7 @@ static const VMStateDescription mv88w8618_timer_vmsd = { }; static const VMStateDescription mv88w8618_pit_vmsd = { - .name = "mv88w8618_pit", + .name = TYPE_MV88W8618_PIT, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -1038,7 +1038,7 @@ static void mv88w8618_flashcfg_init(Object *obj) } static const VMStateDescription mv88w8618_flashcfg_vmsd = { - .name = "mv88w8618_flashcfg", + .name = TYPE_MV88W8618_FLASHCFG, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -1375,7 +1375,7 @@ static void musicpal_gpio_init(Object *obj) } static const VMStateDescription musicpal_gpio_vmsd = { - .name = "musicpal_gpio", + .name = TYPE_MUSICPAL_GPIO, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -1539,7 +1539,7 @@ static void musicpal_key_init(Object *obj) } static const VMStateDescription musicpal_key_vmsd = { - .name = "musicpal_key", + .name = TYPE_MUSICPAL_KEY, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -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 baab4a3d53..dbdddf8ef4 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) @@ -268,7 +267,7 @@ static void mv88w8618_audio_realize(DeviceState *dev, Error **errp) } static const VMStateDescription mv88w8618_audio_vmsd = { - .name = "mv88w8618_audio", + .name = TYPE_MV88W8618_AUDIO, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { diff --git a/include/hw/audio/wm8750.h b/include/hw/audio/wm8750.h index 84e7a119bb..e12cb886d1 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);