[libata] Use new PCI_VDEVICE() macro to dramatically shorten ID lists

Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index c63dbabc0cd9..3d9fa1cc834d 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -123,13 +123,14 @@ static void sil_thaw(struct ata_port *ap);
 
 
 static const struct pci_device_id sil_pci_tbl[] = {
-        { 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
-        { 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
-        { 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3512 },
-        { 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },
-        { 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
-        { 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_no_sata_irq },
-        { 0x1002, 0x437a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_no_sata_irq },
+        { PCI_VDEVICE(CMD, 0x3112), sil_3112 },
+        { PCI_VDEVICE(CMD, 0x0240), sil_3112 },
+        { PCI_VDEVICE(CMD, 0x3512), sil_3512 },
+        { PCI_VDEVICE(CMD, 0x3114), sil_3114 },
+        { PCI_VDEVICE(ATI, 0x436e), sil_3112 },
+        { PCI_VDEVICE(ATI, 0x4379), sil_3112_no_sata_irq },
+        { PCI_VDEVICE(ATI, 0x437a), sil_3112_no_sata_irq },
+
         { }     /* terminate list */
 };