* [PATCH -next] ASoC: amd: acp-da7219-max98357a: Fix -Wunused-variable warning
@ 2021-03-29 14:50 YueHaibing
2021-03-29 17:37 ` Mukunda,Vijendar
0 siblings, 1 reply; 2+ messages in thread
From: YueHaibing @ 2021-03-29 14:50 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, Vijendar.Mukunda
Cc: alsa-devel, linux-kernel, YueHaibing
While ACPI is not set, make W=1 warns:
sound/soc/amd/acp-da7219-max98357a.c:684:28: warning: ‘cz_rt5682_card’ defined but not used [-Wunused-variable]
static struct snd_soc_card cz_rt5682_card = {
^~~~~~~~~~~~~~
sound/soc/amd/acp-da7219-max98357a.c:671:28: warning: ‘cz_card’ defined but not used [-Wunused-variable]
static struct snd_soc_card cz_card = {
Use #ifdef block to guard this.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
sound/soc/amd/acp-da7219-max98357a.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index e65e007fc604..1bf0458e22a8 100644
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -47,13 +47,15 @@
#define DUAL_CHANNEL 2
#define RT5682_PLL_FREQ (48000 * 512)
+extern bool bt_uart_enable;
+void *acp_soc_is_rltk_max(struct device *dev);
+
+#ifdef CONFIG_ACPI
static struct snd_soc_jack cz_jack;
static struct clk *da7219_dai_wclk;
static struct clk *da7219_dai_bclk;
static struct clk *rt5682_dai_wclk;
static struct clk *rt5682_dai_bclk;
-extern bool bt_uart_enable;
-void *acp_soc_is_rltk_max(struct device *dev);
static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
{
@@ -692,6 +694,7 @@ static struct snd_soc_card cz_rt5682_card = {
.controls = cz_mc_controls,
.num_controls = ARRAY_SIZE(cz_mc_controls),
};
+#endif
void *acp_soc_is_rltk_max(struct device *dev)
{
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] ASoC: amd: acp-da7219-max98357a: Fix -Wunused-variable warning
2021-03-29 14:50 [PATCH -next] ASoC: amd: acp-da7219-max98357a: Fix -Wunused-variable warning YueHaibing
@ 2021-03-29 17:37 ` Mukunda,Vijendar
0 siblings, 0 replies; 2+ messages in thread
From: Mukunda,Vijendar @ 2021-03-29 17:37 UTC (permalink / raw)
To: YueHaibing, lgirdwood, broonie, perex, tiwai
Cc: alsa-devel, linux-kernel, arnd, flove, derek.fang, shumingf,
basavaraj.hiregoudar, Sunil-kumar.Dommati, Alexander.Deucher
On 3/29/21 8:20 PM, YueHaibing wrote:
> While ACPI is not set, make W=1 warns:
>
> sound/soc/amd/acp-da7219-max98357a.c:684:28: warning: ‘cz_rt5682_card’ defined but not used [-Wunused-variable]
> static struct snd_soc_card cz_rt5682_card = {
> ^~~~~~~~~~~~~~
> sound/soc/amd/acp-da7219-max98357a.c:671:28: warning: ‘cz_card’ defined but not used [-Wunused-variable]
> static struct snd_soc_card cz_card = {
>
> Use #ifdef block to guard this.
For similar kernel warnings, i have previously pushed patch adding ACPI
dependency.
But I got below review comment for my patch "[PATCH 2/2] ASoC: amd: fix
acpi dependency kernel warning" from Arnd
I would suggest simply dropping the unnecessary #ifdef and
ACPI_PTR() guard.
It might be helpful to hide the Kconfig submenu under
'depends on X86 || COMPILE_TEST'.
-
Vijendar
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> sound/soc/amd/acp-da7219-max98357a.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
> index e65e007fc604..1bf0458e22a8 100644
> --- a/sound/soc/amd/acp-da7219-max98357a.c
> +++ b/sound/soc/amd/acp-da7219-max98357a.c
> @@ -47,13 +47,15 @@
> #define DUAL_CHANNEL 2
> #define RT5682_PLL_FREQ (48000 * 512)
>
> +extern bool bt_uart_enable;
> +void *acp_soc_is_rltk_max(struct device *dev);
> +
> +#ifdef CONFIG_ACPI
> static struct snd_soc_jack cz_jack;
> static struct clk *da7219_dai_wclk;
> static struct clk *da7219_dai_bclk;
> static struct clk *rt5682_dai_wclk;
> static struct clk *rt5682_dai_bclk;
> -extern bool bt_uart_enable;
> -void *acp_soc_is_rltk_max(struct device *dev);
>
> static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
> {
> @@ -692,6 +694,7 @@ static struct snd_soc_card cz_rt5682_card = {
> .controls = cz_mc_controls,
> .num_controls = ARRAY_SIZE(cz_mc_controls),
> };
> +#endif
>
> void *acp_soc_is_rltk_max(struct device *dev)
> {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-29 17:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-29 14:50 [PATCH -next] ASoC: amd: acp-da7219-max98357a: Fix -Wunused-variable warning YueHaibing
2021-03-29 17:37 ` Mukunda,Vijendar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).