[alsa-devel] [PATCH] ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM

Nathan Chancellor natechancellor at gmail.com
Thu Mar 7 16:25:33 CET 2019


On Thu, Mar 07, 2019 at 11:11:30AM +0100, Arnd Bergmann wrote:
> 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 at arndb.de>

Reviewed-by: Nathan Chancellor <natechancellor at gmail.com>

> ---
>  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
> 


More information about the Alsa-devel mailing list