Skip to contentSkip to conversation

Patch "ASoC: rt5514: fix gcc-7 warning" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Oct 5, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

    ASoC: rt5514: fix gcc-7 warning

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     asoc-rt5514-fix-gcc-7-warning.patch

and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 03ba791df98d15d07ea74075122af71e35c7611c Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Thu, 11 May 2017 13:44:38 +0200
Subject: ASoC: rt5514: fix gcc-7 warning

From: Arnd Bergmann <[email protected]>

commit 03ba791df98d15d07ea74075122af71e35c7611c upstream.

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")
---
 sound/soc/codecs/rt5514.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5514.c +2 -2
@@ -395,14 +395,14 @@ static const char * const rt5514_dmic_sr
 	"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);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/arm-remove-duplicate-const-annotations.patch queue-4.9/ttpci-address-stringop-overflow-warning.patch queue-4.9/ib-qib-fix-false-postive-maybe-uninitialized-warning.patch queue-4.9/asoc-rt5514-fix-gcc-7-warning.patch queue-4.9/mips-lantiq-fix-another-request_mem_region-return-code-check.patch queue-4.9/alsa-au88x0-avoid-theoretical-uninitialized-access.patch queue-4.9/asoc-rt5659-drop-double-const.patch