ALSA: hda: fix unused variable warning
PATCH 1/1 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.
--- sound/pci/hda/hda_controller.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
sound/pci/hda/hda_controller.h +4 -5
@@ -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
Signature · 1 line
2.18.0
Quoted 24 lines · Anders Roxell
When
CONFIG_X86=nfunctionazx_snoopdoesn'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(-)sound/pci/hda/hda_controller.h +0
-0@@ -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)
sound/pci/hda/hda_controller.h struct azx { · line 176
Quoted 10 lines
sound/pci/hda/hda_controller.h +4
-5-#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
Quoted 28 lines · Takashi Iwai
Quoted 25 lines · Anders Roxell
When
CONFIG_X86=nfunctionazx_snoopdoesn'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(-)sound/pci/hda/hda_controller.h +0
-0@@ -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)
Quoted 12 lines
sound/pci/hda/hda_controller.h struct azx { · line 176
Quoted 9 lines
sound/pci/hda/hda_controller.h +4
-5-#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.
Quoted 2 lines
Also, please remove the parentheses around
chip->snoop.
OK.
Sending v2 shortly.
Cheers,
Anders
PATCH v2 1/1 ALSA: hda: fix unused variable warning
In reply to Takashi IwaiWhen 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.
--- sound/pci/hda/hda_controller.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
sound/pci/hda/hda_controller.h +4 -5
@@ -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
Signature · 1 line
2.18.0
Takashi Iwai
AppliedQuoted 6 lines · Anders Roxell
When
CONFIG_X86=nfunctionazx_snoopdoesn'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]
Quoted 7 lines
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