2009-07-08 04:18:48

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: sound tree build warning

Hi Takashi,

Today's linux-next build (x86_64 allmodconfig) produced these warnings:

sound/pci/hda/patch_via.c: In function 'via_mux_enum_put':
sound/pci/hda/patch_via.c:395: warning: unused variable 'vendor_id'
sound/pci/hda/patch_via.c: In function 'get_mux_nids':
sound/pci/hda/patch_via.c:1337: warning: unused variable 'type'
sound/pci/hda/patch_via.c:1354: warning: no return statement in function returning non-void

Introduced by commit 337b9d02b4873ceac91565272545fb6fd446d939 ("ALSA: hda
- Fix capture source selection in patch_via.c").

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/


Attachments:
(No filename) (652.00 B)
(No filename) (197.00 B)
Download all attachments

2009-07-08 05:58:26

by Jaswinder Singh Rajput

[permalink] [raw]
Subject: [PATCH] sound: pci/hda/patch_via.c fix compilation warning

On Wed, 2009-07-08 at 14:18 +1000, Stephen Rothwell wrote:
> Hi Takashi,
>
> Today's linux-next build (x86_64 allmodconfig) produced these warnings:
>
> sound/pci/hda/patch_via.c: In function 'via_mux_enum_put':
> sound/pci/hda/patch_via.c:395: warning: unused variable 'vendor_id'
> sound/pci/hda/patch_via.c: In function 'get_mux_nids':
> sound/pci/hda/patch_via.c:1337: warning: unused variable 'type'
> sound/pci/hda/patch_via.c:1354: warning: no return statement in function returning non-void
>
> Introduced by commit 337b9d02b4873ceac91565272545fb6fd446d939 ("ALSA: hda
> - Fix capture source selection in patch_via.c").
>

[PATCH] sound: pci/hda/patch_via.c fix compilation warning

sound/pci/hda/patch_via.c: In function 'via_mux_enum_put':
sound/pci/hda/patch_via.c:395: warning: unused variable 'vendor_id'
sound/pci/hda/patch_via.c: In function 'get_mux_nids':
sound/pci/hda/patch_via.c:1337: warning: unused variable 'type'
sound/pci/hda/patch_via.c:1354: warning: no return statement in function returning non-void

Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
sound/pci/hda/patch_via.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 38db459..d05b718 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -392,7 +392,6 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
struct via_spec *spec = codec->spec;
unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
- unsigned int vendor_id = codec->vendor_id;

if (!spec->mux_nids[adc_idx])
return -EINVAL;
@@ -1330,11 +1329,10 @@ static int via_auto_init(struct hda_codec *codec)
return 0;
}

-static int get_mux_nids(struct hda_codec *codec)
+static void get_mux_nids(struct hda_codec *codec)
{
struct via_spec *spec = codec->spec;
hda_nid_t nid, conn[8];
- unsigned int type;
int i, n;

for (i = 0; i < spec->num_adc_nids; i++) {
--
1.6.0.6


2009-07-08 06:00:40

by Takashi Iwai

[permalink] [raw]
Subject: Re: [PATCH] sound: pci/hda/patch_via.c fix compilation warning

At Wed, 08 Jul 2009 11:27:50 +0530,
Jaswinder Singh Rajput wrote:
>
> On Wed, 2009-07-08 at 14:18 +1000, Stephen Rothwell wrote:
> > Hi Takashi,
> >
> > Today's linux-next build (x86_64 allmodconfig) produced these warnings:
> >
> > sound/pci/hda/patch_via.c: In function 'via_mux_enum_put':
> > sound/pci/hda/patch_via.c:395: warning: unused variable 'vendor_id'
> > sound/pci/hda/patch_via.c: In function 'get_mux_nids':
> > sound/pci/hda/patch_via.c:1337: warning: unused variable 'type'
> > sound/pci/hda/patch_via.c:1354: warning: no return statement in function returning non-void
> >
> > Introduced by commit 337b9d02b4873ceac91565272545fb6fd446d939 ("ALSA: hda
> > - Fix capture source selection in patch_via.c").
> >
>
> [PATCH] sound: pci/hda/patch_via.c fix compilation warning
>
> sound/pci/hda/patch_via.c: In function 'via_mux_enum_put':
> sound/pci/hda/patch_via.c:395: warning: unused variable 'vendor_id'
> sound/pci/hda/patch_via.c: In function 'get_mux_nids':
> sound/pci/hda/patch_via.c:1337: warning: unused variable 'type'
> sound/pci/hda/patch_via.c:1354: warning: no return statement in function returning non-void
>
> Reported-by: Stephen Rothwell <[email protected]>
> Signed-off-by: Jaswinder Singh Rajput <[email protected]>

It was already fixed a few minutes ago :) Thanks anyway.


Takashi


> ---
> sound/pci/hda/patch_via.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
> index 38db459..d05b718 100644
> --- a/sound/pci/hda/patch_via.c
> +++ b/sound/pci/hda/patch_via.c
> @@ -392,7 +392,6 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
> struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
> struct via_spec *spec = codec->spec;
> unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
> - unsigned int vendor_id = codec->vendor_id;
>
> if (!spec->mux_nids[adc_idx])
> return -EINVAL;
> @@ -1330,11 +1329,10 @@ static int via_auto_init(struct hda_codec *codec)
> return 0;
> }
>
> -static int get_mux_nids(struct hda_codec *codec)
> +static void get_mux_nids(struct hda_codec *codec)
> {
> struct via_spec *spec = codec->spec;
> hda_nid_t nid, conn[8];
> - unsigned int type;
> int i, n;
>
> for (i = 0; i < spec->num_adc_nids; i++) {
> --
> 1.6.0.6
>
>
>