OSDN Git Service

ALSA: hda: fix unused variable warning
authorAnders Roxell <anders.roxell@linaro.org>
Tue, 11 Sep 2018 14:18:36 +0000 (16:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jan 2020 09:21:36 +0000 (10:21 +0100)
[ Upstream commit 5b03006d5c58ddd31caf542eef4d0269bcf265b3 ]

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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/pci/hda/hda_controller.h

index 55ec447..499873d 100644 (file)
@@ -164,11 +164,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