Message ID | 20180911141836.14463-1-anders.roxell@linaro.org |
---|---|
State | New |
Headers | show |
Series | [v2] ALSA: hda: fix unused variable warning | expand |
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 <anders.roxell@linaro.org> Applied, thanks. Takashi
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
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 <anders.roxell@linaro.org> --- sound/pci/hda/hda_controller.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.18.0