]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM
authorArnd Bergmann <arnd@arndb.de>
Thu, 7 Mar 2019 10:11:30 +0000 (11:11 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 13 Aug 2019 12:11:36 +0000 (14:11 +0200)
BugLink: https://bugs.launchpad.net/bugs/1837517
[ 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>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
sound/soc/ti/davinci-mcasp.c

index a10fcb5963c67a2b41ac02aaf3e6b7fcb329a990..570d435e3e8be2d2db3cb305bfe3c18bf9488586 100644 (file)
@@ -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;