From: Kai Vehmanen Date: Mon, 21 Sep 2020 14:17:41 +0000 (+0300) Subject: ALSA: hda - fix CONTROLLER_IN_GPU macro name X-Git-Tag: v5.10.7~1331^2~9^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=534ad9afb19b5ac810a5e1c638f371e81e0c1ed6;p=platform%2Fkernel%2Flinux-rpi.git ALSA: hda - fix CONTROLLER_IN_GPU macro name The CONTROLLER_IN_GPU() macro has different semantics than the similarly named macro in hda_intel.c. The name is also misleading as the macro is used to apply a Intel HSW/BDW programming logic for HDA controller clock configuration. Rename macro to reflect the actual implementation. Signed-off-by: Kai Vehmanen Link: https://lore.kernel.org/r/20200921141741.2983072-5-kai.vehmanen@linux.intel.com Signed-off-by: Takashi Iwai --- diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 50b2c1d..d236e49 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -13,7 +13,7 @@ static struct completion bind_complete; -#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \ +#define IS_HSW_CONTROLLER(pci) (((pci)->device == 0x0a0c) || \ ((pci)->device == 0x0c0c) || \ ((pci)->device == 0x0d0c) || \ ((pci)->device == 0x160c)) @@ -41,7 +41,7 @@ void snd_hdac_i915_set_bclk(struct hdac_bus *bus) if (!acomp || !acomp->ops || !acomp->ops->get_cdclk_freq) return; /* only for i915 binding */ - if (!CONTROLLER_IN_GPU(pci)) + if (!IS_HSW_CONTROLLER(pci)) return; /* only HSW/BDW */ cdclk_freq = acomp->ops->get_cdclk_freq(acomp->dev);