public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM
@ 2019-03-07 10:11 Arnd Bergmann
  2019-03-07 13:27 ` Peter Ujfalusi
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Arnd Bergmann @ 2019-03-07 10:11 UTC (permalink / raw)
  To: Peter Ujfalusi, Mark Brown
  Cc: Nick Desaulniers, Arnd Bergmann, Liam Girdwood, Jaroslav Kysela,
	Takashi Iwai, Tony Lindgren, Kees Cook, Vishal Thanki, alsa-devel,
	linux-kernel

Building with clang shows a variable that is only used by the
suspend/resume functions but defined outside of their #ifdef block:

sound/soc/ti/davinci-mcasp.c:48:12: error: variable 'context_regs' is not needed and will not be emitted

We commonly fix these by marking the PM functions as __maybe_unused,
but here that would grow the davinci_mcasp structure, so instead
add another #ifdef here.

Fixes: 1cc0c054f380 ("ASoC: davinci-mcasp: Convert the context save/restore to use array")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 sound/soc/ti/davinci-mcasp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index a3a67a8f0f54..9fbc759fdefe 100644
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -45,6 +45,7 @@
 
 #define MCASP_MAX_AFIFO_DEPTH	64
 
+#ifdef CONFIG_PM
 static u32 context_regs[] = {
 	DAVINCI_MCASP_TXFMCTL_REG,
 	DAVINCI_MCASP_RXFMCTL_REG,
@@ -68,6 +69,7 @@ struct davinci_mcasp_context {
 	u32	*xrsr_regs; /* for serializer configuration */
 	bool	pm_state;
 };
+#endif
 
 struct davinci_mcasp_ruledata {
 	struct davinci_mcasp *mcasp;
-- 
2.20.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-03-14 15:54 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-07 10:11 [PATCH] ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM Arnd Bergmann
2019-03-07 13:27 ` Peter Ujfalusi
2019-03-07 15:25 ` Nathan Chancellor
2019-03-11 17:23 ` Applied "ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM" to the asoc tree Mark Brown
2019-03-13 15:38 ` Mark Brown
2019-03-14 15:53 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox