| Message ID | 5926900.hCFXH4RQH6@wuerfel (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8f273aacc070490f2d5e02e52bbaa35d53a4df15 |
| Headers | show |
On Tue, Jun 14, 2016 at 12:17:52PM +0200, Arnd Bergmann wrote: > A recent commit made a few arrays 'const', but also added the > same attribute to a function return type, where it makes no > sense, and we get a warning when building with W=1: > > sound/soc/codecs/arizona.c:1725:27: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers] > static const char * const arizona_dai_clk_str(int clk_id) > > This removes it again. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: a3178a3ed798 ("ASoC: arizona: Add a couple of missing consts") > --- Oops.. got a bit overzealous there, thanks for fixing. Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Thanks, Charles
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index ed0425763755..ecfdbfcae366 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -1722,7 +1722,7 @@ restore_aif: return ret; } -static const char * const arizona_dai_clk_str(int clk_id) +static const char *arizona_dai_clk_str(int clk_id) { switch (clk_id) { case ARIZONA_CLK_SYSCLK:
A recent commit made a few arrays 'const', but also added the same attribute to a function return type, where it makes no sense, and we get a warning when building with W=1: sound/soc/codecs/arizona.c:1725:27: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers] static const char * const arizona_dai_clk_str(int clk_id) This removes it again. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: a3178a3ed798 ("ASoC: arizona: Add a couple of missing consts") --- This is one of two patches for warnings that were introduced first in today's linux-next.