From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932445AbdEKLqw (ORCPT ); Thu, 11 May 2017 07:46:52 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:62900 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932250AbdEKLqv (ORCPT ); Thu, 11 May 2017 07:46:51 -0400 From: Arnd Bergmann To: Liam Girdwood , Mark Brown Cc: Arnd Bergmann , Bard Liao , Oder Chiou , Douglas Anderson , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ASoC: rt5514: fix gcc-7 warning Date: Thu, 11 May 2017 13:44:38 +0200 Message-Id: <20170511114512.2865725-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:quTdZ3kfHrNn4m4PJhirdfxCVfbhCH+rmrysfEzhZXXd9/eOacJ Uw2TWF090YhLhxUlaIeJ9y6IsnfRvzgQqlFZemf35Kh2cBD67dNnqY6xBIEuEQbH9gDJyYZ FP0NyS0UVEEV/ZXNUXqb2uHTe5Kk4Yd84ysSPcuCZu131uThg9MIiucSom2pcvxSqmPduPh McY4n44tESJMHfOA91T8Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:yYFFh5u4Wak=:D6d1qMQ51892Gras47oKOx 2OxF8dqgchDay5nnlnz9VgkCbXGoNZv773GQhxQRqoafQzRpuB+2y6g4FLIv8ztJ/eGxD+lXd 809p3ZBi4sHvCVfj5rkhDwgQOhYApVe9wiFt6qHwsqx2V9zkxudjr6tXXiLUj7dgYf3D72rn9 4N31WDzpmSkisB3Qj5rIuH0h65OMMKoJEwyUVeiB9A3BjsdSn4B8wVNyLT4StUUyHYHdiP5fN jlk0X1/0jCl1OySvzYrubBkl3pnkeqSo8mWr49q9yAcUfioalReOJUGeXX4vsmESxpGoaLU+c afAY7YFlOsPg5hM2P3zKuOU119BexiNEeSIzJ1sP3T8cQkRP4lE3rRlsmw9SD6ADmWje7IXSQ sO3lTFdPoXWiPebVNJNQftkvis+vJBdYt9XKnD5B/XkfsY5GQYD5GSh3yfp2NfBRifJieQXXb OGRNGkI+CxycWKgfMpFhEaCNE4eAIZQ2YJswA7AD2Od+Ujr/jqsbozC3VIoW4wydZzURRXuvd uT5MrKVKUuhpvodm6N6Y9O4o04arvlVWNDJe0wa7HJn8rEF3IlX0L9vlGj3msNhx3BG16EcxS bjFrlZoZOrIuAeAIZ510O547gY+Fdd4NyDHXM+qogI0yMrWCxzLT48ZYJXNrweuODQviryGx4 awYSRIGk8bu89AfnQCCXL/ssWPegR+yMAhRCA1PPydqF10kOmHuDG2kPEwZ2dKWZAbrY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-7 warns that there is a duplicate 'const' specifier in some variables that are declared using the SOC_ENUM_SINGLE_DECL macro: sound/soc/codecs/rt5514.c:398:14: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier] static const SOC_ENUM_SINGLE_DECL( sound/soc/codecs/rt5514.c:405:14: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier] static const SOC_ENUM_SINGLE_DECL( This removes one to fix the warning. Fixes: 4a6180ea7399 ("ASoC: rt5514: add rt5514 codec driver") Signed-off-by: Arnd Bergmann --- sound/soc/codecs/rt5514.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index f91221b1ddf0..28ab9e2bb051 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c @@ -395,14 +395,14 @@ static const char * const rt5514_dmic_src[] = { "DMIC1", "DMIC2" }; -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( rt5514_stereo1_dmic_enum, RT5514_DIG_SOURCE_CTRL, RT5514_AD0_DMIC_INPUT_SEL_SFT, rt5514_dmic_src); static const struct snd_kcontrol_new rt5514_sto1_dmic_mux = SOC_DAPM_ENUM("Stereo1 DMIC Source", rt5514_stereo1_dmic_enum); -static const SOC_ENUM_SINGLE_DECL( +static SOC_ENUM_SINGLE_DECL( rt5514_stereo2_dmic_enum, RT5514_DIG_SOURCE_CTRL, RT5514_AD1_DMIC_INPUT_SEL_SFT, rt5514_dmic_src); -- 2.9.0