Re: linux-next: build warning after merge of the sound tree

Takashi Iwai
2019-01-21T08:13:39Z

On Mon, 21 Jan 2019 01:21:48 +0100,
Stephen Rothwell wrote:
On Mon, 21 Jan 2019 01:21:48 +0100,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> After merging the sound tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
>
> sound/pci/hda/hda_codec.c: In function 'hda_codec_runtime_suspend':
> sound/pci/hda/hda_codec.c:2926:18: warning: unused variable 'pcm' [-Wunused-variable]
> struct hda_pcm *pcm;
> ^~~
>
> Introduced by commit
>
> 17bc4815de58 ("ALSA: pci: Remove superfluous snd_pcm_suspend*() calls")

Thanks, fixed now with the patch below.

Takashi

-- 8< --
From: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH] ALSA: hda - Fix unused variable warning

The unused variable was forgotten to be removed and now we get a
compiler warning:
sound/pci/hda/hda_codec.c: In function 'hda_codec_runtime_suspend':
sound/pci/hda/hda_codec.c:2926:18: warning: unused variable 'pcm'

Fixes: 17bc4815de58 ("ALSA: pci: Remove superfluous snd_pcm_suspend*() calls")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/hda/hda_codec.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index ff6dbed4d3cd..e4704f5729d3 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2923,7 +2923,6 @@ static void hda_call_codec_resume(struct hda_codec *codec)
static int hda_codec_runtime_suspend(struct device *dev)
{
struct hda_codec *codec = dev_to_hda_codec(dev);
- struct hda_pcm *pcm;
unsigned int state;

cancel_delayed_work_sync(&codec->jackpoll_work);
--
2.16.4