2023-06-28 13:04:12

by Amadeusz Sławiński

Subject: [RFC PATCH 4/8] ALSA: hda/i915: Update PCI IDs

Use PCI device IDs from pci_ids.h header

Signed-off-by: Amadeusz Sławiński <[email protected]>
---
sound/hda/hdac_i915.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index 161a9711cd63..e9342e74b739 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -11,10 +11,10 @@
#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))
+#define IS_HSW_CONTROLLER(pci) (((pci)->device == PCI_DEVICE_ID_INTEL_HDA_HSW_0) || \
+ ((pci)->device == PCI_DEVICE_ID_INTEL_HDA_HSW_2) || \
+ ((pci)->device == PCI_DEVICE_ID_INTEL_HDA_HSW_3) || \
+ ((pci)->device == PCI_DEVICE_ID_INTEL_HDA_BDW))

/**
* snd_hdac_i915_set_bclk - Reprogram BCLK for HSW/BDW
--
2.34.1

2023-06-28 15:12:07

by Andy Shevchenko

Subject: Re: [RFC PATCH 4/8] ALSA: hda/i915: Update PCI IDs

On Wed, Jun 28, 2023 at 05:42:54PM +0300, Andy Shevchenko wrote:
> On Wed, Jun 28, 2023 at 10:51:31PM +0200, Amadeusz Sławiński wrote:

...

> > -#define IS_HSW_CONTROLLER(pci) (((pci)->device == 0x0a0c) || \
> > - ((pci)->device == 0x0c0c) || \
> > - ((pci)->device == 0x0d0c) || \
> > - ((pci)->device == 0x160c))
> > +#define IS_HSW_CONTROLLER(pci) (((pci)->device == PCI_DEVICE_ID_INTEL_HDA_HSW_0) || \
> > + ((pci)->device == PCI_DEVICE_ID_INTEL_HDA_HSW_2) || \
> > + ((pci)->device == PCI_DEVICE_ID_INTEL_HDA_HSW_3) || \
> > + ((pci)->device == PCI_DEVICE_ID_INTEL_HDA_BDW))
>
> The very same macro under different name appeared in the previous patch.
> Am I correct? Perhaps go further and first move it somewhere to be available
> for both?

Ah, this one is a subset of that one, nevertheless the proposal stays.

--
With Best Regards,
Andy Shevchenko

2023-06-28 15:24:05

by Andy Shevchenko

Subject: Re: [RFC PATCH 4/8] ALSA: hda/i915: Update PCI IDs

On Wed, Jun 28, 2023 at 10:51:31PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header

Missing period at the end.

...

> -#define IS_HSW_CONTROLLER(pci) (((pci)->device == 0x0a0c) || \
> - ((pci)->device == 0x0c0c) || \
> - ((pci)->device == 0x0d0c) || \
> - ((pci)->device == 0x160c))
> +#define IS_HSW_CONTROLLER(pci) (((pci)->device == PCI_DEVICE_ID_INTEL_HDA_HSW_0) || \
> + ((pci)->device == PCI_DEVICE_ID_INTEL_HDA_HSW_2) || \
> + ((pci)->device == PCI_DEVICE_ID_INTEL_HDA_HSW_3) || \
> + ((pci)->device == PCI_DEVICE_ID_INTEL_HDA_BDW))

The very same macro under different name appeared in the previous patch.
Am I correct? Perhaps go further and first move it somewhere to be available
for both?

--
With Best Regards,
Andy Shevchenko