[v3,06/15] ALSA: hda: Use global PCI match macro

Message ID	20230714202457.423866-7-amadeuszx.slawinski@linux.intel.com
State	Superseded
Headers	show Return-Path: <alsa-devel-bounces@alsa-project.org> From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= <amadeuszx.slawinski@linux.intel.com> To: Bjorn Helgaas <bhelgaas@google.com>, Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com> Cc: alsa-devel@alsa-project.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Cezary Rojewski <cezary.rojewski@intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Kai Vehmanen <kai.vehmanen@linux.intel.com>, Andy Shevchenko <andriy.shevchenko@intel.com>, Hans de Goede <hdegoede@redhat.com>, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= <amadeuszx.slawinski@linux.intel.com>, Andy Shevchenko <andriy.shevchenko@linux.intel.com> Subject: [PATCH v3 06/15] ALSA: hda: Use global PCI match macro Date: Fri, 14 Jul 2023 22:24:48 +0200 Message-Id: <20230714202457.423866-7-amadeuszx.slawinski@linux.intel.com> In-Reply-To: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com> References: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID-Hash: F4WXOKACFZKA4B3DNYPUSVPSC62PGZAD Precedence: list Archived-At: <https://mailman.alsa-project.org/hyperkitty/list/alsa-devel@alsa-project.org/message/F4WXOKACFZKA4B3DNYPUSVPSC62PGZAD/>
Series	PCI: Define Intel PCI IDs and use them in drivers \| expand [v3,00/15] PCI: Define Intel PCI IDs and use them in drivers [v3,01/15] PCI: Sort Intel PCI IDs by number [v3,02/15] PCI: Add Intel Audio DSP devices to pci_ids.h [v3,03/15] ASoC: SOF: Remove unused Broxton PCI ID [v3,04/15] ALSA: Remove unused Broxton PCI ID [v3,05/15] ALSA: hda: Add controller matching macros [v3,06/15] ALSA: hda: Use global PCI match macro [v3,07/15] ALSA: hda/i915: Use global PCI match macro [v3,08/15] ASoC: Intel: Skylake: Use global PCI match macro [v3,09/15] ALSA: intel-dsp-config: Convert to PCI device IDs defines [v3,10/15] ALSA: hda: Convert to PCI device IDs defines [v3,11/15] ASoC: Intel: avs: Convert to PCI device IDs defines [v3,12/15] ASoC: Intel: avs: Convert to PCI device IDs defines [v3,13/15] ASoC: Intel: Skylake: Convert to PCI device IDs defines [v3,14/15] ASoC: SOF: Intel: Convert to PCI device IDs defines [v3,15/15] ASoC: Intel: sst: Convert to PCI device IDs defines

Message ID

20230714202457.423866-7-amadeuszx.slawinski@linux.intel.com

State

Superseded

Headers

From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?=
 <amadeuszx.slawinski@linux.intel.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
	Mark Brown <broonie@kernel.org>,
	Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org, linux-pci@vger.kernel.org,
 linux-kernel@vger.kernel.org, Cezary Rojewski <cezary.rojewski@intel.com>,
 Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
 Kai Vehmanen <kai.vehmanen@linux.intel.com>,
 Andy Shevchenko <andriy.shevchenko@intel.com>,
 Hans de Goede <hdegoede@redhat.com>,
 =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= <amadeuszx.slawinski@linux.intel.com>,
 Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v3 06/15] ALSA: hda: Use global PCI match macro
Date: Fri, 14 Jul 2023 22:24:48 +0200
Message-Id: <20230714202457.423866-7-amadeuszx.slawinski@linux.intel.com>
In-Reply-To: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com>
References: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-ID-Hash: F4WXOKACFZKA4B3DNYPUSVPSC62PGZAD
Precedence: list
Archived-At: 
 <https://mailman.alsa-project.org/hyperkitty/list/alsa-devel@alsa-project.org/message/F4WXOKACFZKA4B3DNYPUSVPSC62PGZAD/>

Series

PCI: Define Intel PCI IDs and use them in drivers | expand

Commit Message

Amadeusz Sławiński July 14, 2023, 8:24 p.m. UTC

Instead of using local macro to match PCI device, use global one. As
Apollolake is Broxton-P successor that made it to the market, be precise
and use APL shortcut.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/pci/hda/hda_intel.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 8f0cebb83302..5e59dcc35665 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -330,18 +330,6 @@  enum {
 #define needs_eld_notify_link(chip)	false
 #endif
 
-#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) &&         \
-				       (((pci)->device == 0x0a0c) || \
-					((pci)->device == 0x0c0c) || \
-					((pci)->device == 0x0d0c) || \
-					((pci)->device == 0x160c) || \
-					((pci)->device == 0x490d) || \
-					((pci)->device == 0x4f90) || \
-					((pci)->device == 0x4f91) || \
-					((pci)->device == 0x4f92)))
-
-#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
-
 static const char * const driver_short_names[] = {
 	[AZX_DRIVER_ICH] = "HDA Intel",
 	[AZX_DRIVER_PCH] = "HDA Intel PCH",
@@ -573,7 +561,7 @@  static void hda_intel_init_chip(struct azx *chip, bool full_reset)
 	snd_hdac_set_codec_wakeup(bus, false);
 
 	/* reduce dma latency to avoid noise */
-	if (IS_BXT(pci))
+	if (HDA_CONTROLLER_IS_APL(pci))
 		bxt_reduce_dma_latency(chip);
 
 	if (bus->mlcap != NULL)
@@ -2175,7 +2163,7 @@  static int azx_probe(struct pci_dev *pci,
 #endif /* CONFIG_SND_HDA_PATCH_LOADER */
 
 #ifndef CONFIG_SND_HDA_I915
-	if (CONTROLLER_IN_GPU(pci))
+	if (HDA_CONTROLLER_IN_GPU(pci))
 		dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
 #endif
 
@@ -2283,7 +2271,7 @@  static int azx_probe_continue(struct azx *chip)
 			 * for other chips, still continue probing as other
 			 * codecs can be on the same link.
 			 */
-			if (CONTROLLER_IN_GPU(pci)) {
+			if (HDA_CONTROLLER_IN_GPU(pci)) {
 				dev_err(chip->card->dev,
 					"HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
 				goto out_free;
@@ -2294,7 +2282,7 @@  static int azx_probe_continue(struct azx *chip)
 		}
 
 		/* HSW/BDW controllers need this power */
-		if (CONTROLLER_IN_GPU(pci))
+		if (HDA_CONTROLLER_IN_GPU(pci))
 			hda->need_i915_power = true;
 	}

[v3,06/15] ALSA: hda: Use global PCI match macro

Commit Message

Patch