Fwd: [PATCH] ASoC: SOF: Fix unused variable warnings

Fwd: [PATCH] ASoC: SOF: Fix unused variable warnings

[Takashi Iwai]

[-- Attachment #1: Type: text/plain, Size: 71 bytes --]

Oops, forgot to add to Cc to alsa-devel ML.
Forwarding now.


Takashi


[-- Attachment #2: Type: message/rfc822, Size: 1487 bytes --]

From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@kernel.org>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH] ASoC: SOF: Fix unused variable warnings
Date: Wed,  8 May 2019 10:50:37 +0200
Message-ID: <20190508085037.24773-1-tiwai@suse.de>

The recent fix for the build fix caused a couple of unused variable
compiler warnings when CONFIG_SND_SOC_SOF_NOCODEC isn't set:
  sound/soc/sof/core.c:263:6: warning: unused variable ‘ret’ [-Wunused-variable]
  sound/soc/sof/core.c:262:28: warning: unused variable ‘machine’ [-Wunused-variable]

Fix them by adding another ifdef.

Fixes: ce38a75089f7 ("ASoC: SOF: core: fix undefined nocodec reference")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

Another trivial fix for a bug I see after pulling the second batch.

 sound/soc/sof/core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 5ddbfa8f1a28..32105e0fabe8 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -259,8 +259,10 @@ int snd_sof_create_page_table(struct snd_sof_dev *sdev,
 static int sof_machine_check(struct snd_sof_dev *sdev)
 {
 	struct snd_sof_pdata *plat_data = sdev->pdata;
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_NOCODEC)
 	struct snd_soc_acpi_mach *machine;
 	int ret;
+#endif
 
 	if (plat_data->machine)
 		return 0;
-- 
2.16.4


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: Fwd: [PATCH] ASoC: SOF: Fix unused variable warnings

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 288 bytes --]

On Wed, May 08, 2019 at 10:52:53AM +0200, Takashi Iwai wrote:
> Oops, forgot to add to Cc to alsa-devel ML.
> Forwarding now.

Forwarding stuff doesn't work with patchwork or with git am and with my
scripts using patchwork if things don't hit the list they get delayed by
several days :/

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: Fwd: [PATCH] ASoC: SOF: Fix unused variable warnings

[Takashi Iwai]

On Wed, 08 May 2019 11:32:49 +0200,
Mark Brown wrote:
> 
> On Wed, May 08, 2019 at 10:52:53AM +0200, Takashi Iwai wrote:
> > Oops, forgot to add to Cc to alsa-devel ML.
> > Forwarding now.
> 
> Forwarding stuff doesn't work with patchwork or with git am and with my
> scripts using patchwork if things don't hit the list they get delayed by
> several days :/

I mind resubmitting, but I thought it would mind you.
OK, will resend in such a case at the next time.


Takashi

Re: Fwd: [PATCH] ASoC: SOF: Fix unused variable warnings

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 681 bytes --]

On Wed, May 08, 2019 at 11:51:48AM +0200, Takashi Iwai wrote:
> Mark Brown wrote:

> > Forwarding stuff doesn't work with patchwork or with git am and with my
> > scripts using patchwork if things don't hit the list they get delayed by
> > several days :/

> I mind resubmitting, but I thought it would mind you.
> OK, will resend in such a case at the next time.

It would've got applied after a few days either way, what I'm doing at
the minute is saving patches I want to apply to mailboxes that are then
applied by a script.  If the script can't find the patch in patchwork
it'll give things a few days in case it's been held up by moderation on
the list then apply it anyway.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: Fwd: [PATCH] ASoC: SOF: Fix unused variable warnings

[Takashi Iwai]

On Wed, 08 May 2019 12:13:02 +0200,
Mark Brown wrote:
> 
> On Wed, May 08, 2019 at 11:51:48AM +0200, Takashi Iwai wrote:
> > Mark Brown wrote:
> 
> > > Forwarding stuff doesn't work with patchwork or with git am and with my
> > > scripts using patchwork if things don't hit the list they get delayed by
> > > several days :/
> 
> > I mind resubmitting, but I thought it would mind you.

Gah, I meant I "don't" mind.

> > OK, will resend in such a case at the next time.
> 
> It would've got applied after a few days either way, what I'm doing at
> the minute is saving patches I want to apply to mailboxes that are then
> applied by a script.  If the script can't find the patch in patchwork
> it'll give things a few days in case it's been held up by moderation on
> the list then apply it anyway.

Heh, good to know about your black magic :)


Takashi