| Message ID | 20230711125726.3509391-5-amadeuszx.slawinski@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: Define Intel PCI IDs and use them in drivers | expand |
On Tue, Jul 11, 2023 at 02:57:17PM +0200, Amadeusz Sławiński wrote: > Instead of using local macro to match PCI device, use global one. I believe from the previous discussion that this one needs a couple of words w.r.t. BXT --> APL change. Otherwise, FWIW, 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 ef831770ca7d..143efa54b9bf 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; > } > > -- > 2.34.1 >
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ef831770ca7d..143efa54b9bf 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; }
Instead of using local macro to match PCI device, use global one. 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(-)