]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ALSA: hda - fix CONTROLLER_IN_GPU macro name
authorKai Vehmanen <kai.vehmanen@linux.intel.com>
Mon, 21 Sep 2020 14:17:41 +0000 (17:17 +0300)
committerTakashi Iwai <tiwai@suse.de>
Mon, 21 Sep 2020 15:58:47 +0000 (17:58 +0200)
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 <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200921141741.2983072-5-kai.vehmanen@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/hda/hdac_i915.c

index 50b2c1db429baef6857846705cb37e6a79e67efd..d236e497435dfbd85d94488eee4f01187a29a757 100644 (file)
@@ -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);