| From 570d13aca73f08763ec479ca9213092e41cd0284 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 11 Sep 2018 16:18:36 +0200 |
| Subject: ALSA: hda: fix unused variable warning |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Anders Roxell <anders.roxell@linaro.org> |
| |
| [ 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 | 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 b83feecf1e40c..8f93869982703 100644 |
| --- a/sound/pci/hda/hda_controller.h |
| +++ b/sound/pci/hda/hda_controller.h |
| @@ -171,11 +171,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.20.1 |
| |
