| From 99af60589a1ac191edca4ff7ba60ce62c12e9a43 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Thu, 7 Mar 2019 11:11:30 +0100 |
| Subject: ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM |
| |
| [ Upstream commit 8ca5104715cfd14254ea5aecc390ae583b707607 ] |
| |
| 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> |
| Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> |
| Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 a10fcb5963c67..570d435e3e8be 100644 |
| --- a/sound/soc/ti/davinci-mcasp.c |
| +++ b/sound/soc/ti/davinci-mcasp.c |
| @@ -44,6 +44,7 @@ |
| |
| #define MCASP_MAX_AFIFO_DEPTH 64 |
| |
| +#ifdef CONFIG_PM |
| static u32 context_regs[] = { |
| DAVINCI_MCASP_TXFMCTL_REG, |
| DAVINCI_MCASP_RXFMCTL_REG, |
| @@ -66,6 +67,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.1 |
| |
