LinuxLists.cc - [PATCH] ASoC: davinci-mcasp: Fix clang warning without CONFIG

2019-03-07 10:14:49

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

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 <[email protected]>
---
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

2019-03-07 13:29:40

by Peter Ujfalusi

[permalink] [raw]

Subject: Re: [PATCH] ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM

On 07/03/2019 12.11, 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.

Acked-by: Peter Ujfalusi <[email protected]>

> Fixes: 1cc0c054f380 ("ASoC: davinci-mcasp: Convert the context save/restore to use array")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> 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;
>

- Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2019-03-07 15:27:37

by Nathan Chancellor

[permalink] [raw]

Subject: Re: [PATCH] ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM

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 <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>

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

2019-03-11 17:25:14

by Mark Brown

[permalink] [raw]

Subject: Applied "ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM" to the asoc tree

The patch

ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 8ca5104715cfd14254ea5aecc390ae583b707607 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Thu, 7 Mar 2019 11:11:30 +0100
Subject: [PATCH] ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM

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 <[email protected]>
Acked-by: Peter Ujfalusi <[email protected]>
Reviewed-by: Nathan Chancellor <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
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.1

2019-03-13 15:43:10

by Mark Brown

[permalink] [raw]

Subject: Applied "ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM" to the asoc tree

2019-03-14 15:55:18

by Mark Brown

[permalink] [raw]