ALSA: hda - Reduce pci id list for Intel with class id

Most of Intel controllers work as generic HD-audio without quirks,
and it'll be hopefully so in future.  Let's mark pci id with the
PCI_CLASS_MULTIMEDIA_HD_AUDIO for Intel so that the driver will work
with any new control chips in future.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 5 insertions, 13 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 34940a07905..5f6f9039a41 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2735,25 +2735,17 @@ static void __devexit azx_remove(struct pci_dev *pci)
 
 /* PCI IDs */
 static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
-        /* ICH 6..10 */
-        { PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x27d8), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x269a), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x284b), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x2911), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x293e), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x293f), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x3a3e), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH },
-        /* PCH */
-        { PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x3b57), .driver_data = AZX_DRIVER_ICH },
         /* CPT */
         { PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH },
         /* PBG */
         { PCI_DEVICE(0x8086, 0x1d20), .driver_data = AZX_DRIVER_PCH },
         /* SCH */
         { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },
+        /* Generic Intel */
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
+          .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
+          .class_mask = 0xffffff,
+          .driver_data = AZX_DRIVER_ICH },
         /* ATI SB 450/600 */
         { PCI_DEVICE(0x1002, 0x437b), .driver_data = AZX_DRIVER_ATI },
         { PCI_DEVICE(0x1002, 0x4383), .driver_data = AZX_DRIVER_ATI },