2018-09-11 08:26:36

by Anders Roxell

Subject: [PATCH] ALSA: hda: fix unused variable warning

When CONFIG_X86=n function azx_snoop doesn't use the variable chip it
only returns true.

sound/pci/hda/hda_intel.c: In function ‘dma_alloc_pages’:
sound/pci/hda/hda_intel.c:2002:14: warning: unused variable ‘chip’ [-Wunused-variable]
struct azx *chip = bus_to_azx(bus);
^~~~

Create a inline function of azx_snoop.

Fixes: a41d122449be ("ALSA: hda - Embed bus into controller object")
Signed-off-by: Anders Roxell <[email protected]>
---
sound/pci/hda/hda_controller.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
index 0053b704ddc4..aa20048742d0 100644
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
@@ -170,11 +170,10 @@ struct azx {
#define azx_bus(chip) (&(chip)->bus.core)
#define bus_to_azx(_bus) container_of(_bus, struct azx, bus.core)

-#ifdef CONFIG_X86
-#define azx_snoop(chip) ((chip)->snoop)
-#else
-#define azx_snoop(chip) true
-#endif
+static inline bool azx_snoop(struct azx *chip)
+{
+ return IS_ENABLED(CONFIG_X86) || (chip->snoop);
+}

/*
* macros for easy use
--
2.18.0

2018-09-11 08:38:26

by Takashi Iwai

Subject: Re: [PATCH] ALSA: hda: fix unused variable warning

On Tue, 11 Sep 2018 10:25:59 +0200,
Anders Roxell wrote:
>
> When CONFIG_X86=n function azx_snoop doesn't use the variable chip it
> only returns true.
>
> sound/pci/hda/hda_intel.c: In function ‘dma_alloc_pages’:
> sound/pci/hda/hda_intel.c:2002:14: warning: unused variable ‘chip’ [-Wunused-variable]
> struct azx *chip = bus_to_azx(bus);
> ^~~~
>
> Create a inline function of azx_snoop.
>
> Fixes: a41d122449be ("ALSA: hda - Embed bus into controller object")
> Signed-off-by: Anders Roxell <[email protected]>
> ---
> sound/pci/hda/hda_controller.h | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
> index 0053b704ddc4..aa20048742d0 100644
> --- a/sound/pci/hda/hda_controller.h
> +++ b/sound/pci/hda/hda_controller.h
> @@ -170,11 +170,10 @@ struct azx {
> #define azx_bus(chip) (&(chip)->bus.core)
> #define bus_to_azx(_bus) container_of(_bus, struct azx, bus.core)
>
> -#ifdef CONFIG_X86
> -#define azx_snoop(chip) ((chip)->snoop)
> -#else
> -#define azx_snoop(chip) true
> -#endif
> +static inline bool azx_snoop(struct azx *chip)
> +{
> + return IS_ENABLED(CONFIG_X86) || (chip->snoop);
> +}

The idea is good, but the patch is obviously wrong; it should be
!IS_ENABLED() :)

Also, please remove the parentheses around chip->snoop.


thanks,

Takashi

2018-09-11 14:20:55

by Anders Roxell

Subject: [PATCH v2] ALSA: hda: fix unused variable warning

When CONFIG_X86=n function azx_snoop doesn't use the variable chip it
only returns true.

sound/pci/hda/hda_intel.c: In function ‘dma_alloc_pages’:
sound/pci/hda/hda_intel.c:2002:14: warning: unused variable ‘chip’ [-Wunused-variable]
struct azx *chip = bus_to_azx(bus);
^~~~

Create a inline function of azx_snoop.

Fixes: a41d122449be ("ALSA: hda - Embed bus into controller object")
Signed-off-by: Anders Roxell <[email protected]>
---
sound/pci/hda/hda_controller.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
index 0053b704ddc4..c95097bb5a0c 100644
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
@@ -170,11 +170,10 @@ struct azx {
#define azx_bus(chip) (&(chip)->bus.core)
#define bus_to_azx(_bus) container_of(_bus, struct azx, bus.core)

-#ifdef CONFIG_X86
-#define azx_snoop(chip) ((chip)->snoop)
-#else
-#define azx_snoop(chip) true
-#endif
+static inline bool azx_snoop(struct azx *chip)
+{
+ return !IS_ENABLED(CONFIG_X86) || chip->snoop;
+}

/*
* macros for easy use
--
2.18.0

2018-09-11 14:20:55

by Anders Roxell

Subject: Re: [PATCH] ALSA: hda: fix unused variable warning

On Tue, 11 Sep 2018 at 10:38, Takashi Iwai <[email protected]> wrote:
>
> On Tue, 11 Sep 2018 10:25:59 +0200,
> Anders Roxell wrote:
> >
> > When CONFIG_X86=n function azx_snoop doesn't use the variable chip it
> > only returns true.
> >
> > sound/pci/hda/hda_intel.c: In function ‘dma_alloc_pages’:
> > sound/pci/hda/hda_intel.c:2002:14: warning: unused variable ‘chip’ [-Wunused-variable]
> > struct azx *chip = bus_to_azx(bus);
> > ^~~~
> >
> > Create a inline function of azx_snoop.
> >
> > Fixes: a41d122449be ("ALSA: hda - Embed bus into controller object")
> > Signed-off-by: Anders Roxell <[email protected]>
> > ---
> > sound/pci/hda/hda_controller.h | 9 ++++-----
> > 1 file changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
> > index 0053b704ddc4..aa20048742d0 100644
> > --- a/sound/pci/hda/hda_controller.h
> > +++ b/sound/pci/hda/hda_controller.h
> > @@ -170,11 +170,10 @@ struct azx {
> > #define azx_bus(chip) (&(chip)->bus.core)
> > #define bus_to_azx(_bus) container_of(_bus, struct azx, bus.core)
> >
> > -#ifdef CONFIG_X86
> > -#define azx_snoop(chip) ((chip)->snoop)
> > -#else
> > -#define azx_snoop(chip) true
> > -#endif
> > +static inline bool azx_snoop(struct azx *chip)
> > +{
> > + return IS_ENABLED(CONFIG_X86) || (chip->snoop);
> > +}
>
> The idea is good, but the patch is obviously wrong; it should be
> !IS_ENABLED() :)

oops, right.

>
> Also, please remove the parentheses around chip->snoop.

OK.

Sending v2 shortly.

Cheers,
Anders

2018-09-11 14:47:47

by Takashi Iwai

Subject: Re: [PATCH v2] ALSA: hda: fix unused variable warning

On Tue, 11 Sep 2018 16:18:36 +0200,
Anders Roxell wrote:
>
> When CONFIG_X86=n function azx_snoop doesn't use the variable chip it
> only returns true.
>
> sound/pci/hda/hda_intel.c: In function ‘dma_alloc_pages’:
> sound/pci/hda/hda_intel.c:2002:14: warning: unused variable ‘chip’ [-Wunused-variable]
> struct azx *chip = bus_to_azx(bus);
> ^~~~
>
> Create a inline function of azx_snoop.
>
> Fixes: a41d122449be ("ALSA: hda - Embed bus into controller object")
> Signed-off-by: Anders Roxell <[email protected]>

Applied, thanks.


Takashi