From: "Amadeusz Sławiński" <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>,
"Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 07/15] ALSA: hda/i915: Use global PCI match macro
Date: Fri, 14 Jul 2023 20:56:07 +0200 [thread overview]
Message-ID: <20230714185615.370597-8-amadeuszx.slawinski@linux.intel.com> (raw)
In-Reply-To: <20230714185615.370597-1-amadeuszx.slawinski@linux.intel.com>
Instead of using local macro to match PCI device, use global one.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
include/linux/pci_ids.h | 1 -
sound/hda/hdac_i915.c | 7 +------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index eb0b3ad64246..d4392f7c51a1 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2718,7 +2718,6 @@
#define PCI_DEVICE_ID_INTEL_82840_HB 0x1a21
#define PCI_DEVICE_ID_INTEL_82845_HB 0x1a30
#define PCI_DEVICE_ID_INTEL_IOAT 0x1a38
-#define PCI_DEVICE_ID_INTEL_HDA_APL_T 0x1a98
#define PCI_DEVICE_ID_INTEL_HDA_CPT 0x1c20
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN 0x1c41
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index 161a9711cd63..2a451ff4fe6a 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -11,11 +11,6 @@
#include <sound/hda_i915.h>
#include <sound/hda_register.h>
-#define IS_HSW_CONTROLLER(pci) (((pci)->device == 0x0a0c) || \
- ((pci)->device == 0x0c0c) || \
- ((pci)->device == 0x0d0c) || \
- ((pci)->device == 0x160c))
-
/**
* snd_hdac_i915_set_bclk - Reprogram BCLK for HSW/BDW
* @bus: HDA core bus
@@ -39,7 +34,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 (!IS_HSW_CONTROLLER(pci))
+ if (!HDA_CONTROLLER_IS_HSW(pci))
return; /* only HSW/BDW */
cdclk_freq = acomp->ops->get_cdclk_freq(acomp->dev);
--
2.34.1
next prev parent reply other threads:[~2023-07-14 10:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-14 18:56 [PATCH v2 00/15] PCI: Define Intel PCI IDs and use them in drivers Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 01/15] PCI: Sort Intel PCI IDs by number Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 02/15] PCI: Add Intel Audio DSP devices to pci_ids.h Amadeusz Sławiński
2023-07-14 11:16 ` Andy Shevchenko
2023-07-14 18:56 ` [PATCH v2 03/15] ASoC: SOF: Remove unused Broxton PCI ID Amadeusz Sławiński
2023-07-14 11:17 ` Andy Shevchenko
2023-07-14 18:56 ` [PATCH v2 04/15] ALSA: " Amadeusz Sławiński
2023-07-14 11:18 ` Andy Shevchenko
2023-07-14 18:56 ` [PATCH v2 05/15] ALSA: hda: Add controller matching macros Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 06/15] ALSA: hda: Use global PCI match macro Amadeusz Sławiński
2023-07-14 18:56 ` Amadeusz Sławiński [this message]
2023-07-14 11:20 ` [PATCH v2 07/15] ALSA: hda/i915: " Andy Shevchenko
2023-07-14 11:23 ` Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 08/15] ASoC: Intel: Skylake: " Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 09/15] ALSA: intel-dsp-config: Convert to PCI device IDs defines Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 10/15] ALSA: hda: " Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 11/15] ASoC: Intel: avs: " Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 12/15] " Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 13/15] ASoC: Intel: Skylake: " Amadeusz Sławiński
2023-07-14 18:56 ` [PATCH v2 14/15] ASoC: SOF: Intel: " Amadeusz Sławiński
2023-07-14 11:23 ` Andy Shevchenko
2023-07-14 18:56 ` [PATCH v2 15/15] ASoC: Intel: sst: " Amadeusz Sławiński
2023-07-14 11:26 ` Andy Shevchenko
2023-07-14 11:32 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230714185615.370597-8-amadeuszx.slawinski@linux.intel.com \
--to=amadeuszx.slawinski@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=andriy.shevchenko@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=hdegoede@redhat.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®