6 files changed, 101 insertions, 119 deletions

diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c
index 1e85f743214e..f1d464f1e107 100644
--- a/drivers/isdn/hardware/eicon/divamnt.c
+++ b/drivers/isdn/hardware/eicon/divamnt.c
@@ -14,7 +14,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 
 #include "platform.h"
@@ -22,6 +22,7 @@
 #include "divasync.h"
 #include "debug_if.h"
 
+static DEFINE_MUTEX(maint_mutex);
 static char *main_revision = "$Revision: 1.32.6.10 $";
 
 static int major;
@@ -130,7 +131,7 @@ static int maint_open(struct inode *ino, struct file *filep)
 {
         int ret;
 
-        lock_kernel();
+        mutex_lock(&maint_mutex);
         /* only one open is allowed, so we test
            it atomically */
         if (test_and_set_bit(0, &opened))
@@ -139,7 +140,7 @@ static int maint_open(struct inode *ino, struct file *filep)
                 filep->private_data = NULL;
                 ret = nonseekable_open(ino, filep);
         }
-        unlock_kernel();
+        mutex_unlock(&maint_mutex);
         return ret;
 }
 
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index f577719ab3fa..42d3b8346034 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -18,7 +18,6 @@
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
 #include <linux/seq_file.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 #include "platform.h"
@@ -402,7 +401,6 @@ static unsigned int um_idi_poll(struct file *file, poll_table * wait)
 
 static int um_idi_open(struct inode *inode, struct file *file)
 {
-        cycle_kernel_lock();
         return (0);
 }
 
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index fbbcb27fb681..ed9c55506797 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -21,7 +21,6 @@
 #include <linux/list.h>
 #include <linux/poll.h>
 #include <linux/kmod.h>
-#include <linux/smp_lock.h>
 
 #include "platform.h"
 #undef ID_MASK
@@ -113,41 +112,40 @@ typedef struct _diva_os_thread_dpc {
   This table should be sorted by PCI device ID
   */
 static struct pci_device_id divas_pci_tbl[] = {
-/* Diva Server BRI-2M PCI 0xE010 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_MAESTRA_PCI},
-/* Diva Server 4BRI-8M PCI 0xE012 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAQ,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_Q_8M_PCI},
-/* Diva Server 4BRI-8M 2.0 PCI 0xE013 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAQ_U,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_Q_8M_V2_PCI},
-/* Diva Server PRI-30M PCI 0xE014 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_P_30M_PCI},
-/* Diva Server PRI 2.0 adapter 0xE015 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_P_30M_V2_PCI},
-/* Diva Server Voice 4BRI-8M PCI 0xE016 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_4BRI_VOIP,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_Q_8M_PCI},
-/* Diva Server Voice 4BRI-8M 2.0 PCI 0xE017 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_4BRI_2_VOIP,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_Q_8M_V2_PCI},
-/* Diva Server BRI-2M 2.0 PCI 0xE018 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_BRI2M_2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_B_2M_V2_PCI},
-/* Diva Server Voice PRI 2.0 PCI 0xE019 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2_VOIP,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         CARDTYPE_DIVASRV_VOICE_P_30M_V2_PCI},
-/* Diva Server 2FX 0xE01A */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_2F,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_B_2F_PCI},
-/* Diva Server Voice BRI-2M 2.0 PCI 0xE01B */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_BRI2M_2_VOIP,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_B_2M_V2_PCI},
-        {0,}                    /* 0 terminated list. */
+        /* Diva Server BRI-2M PCI 0xE010 */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRA),
+                CARDTYPE_MAESTRA_PCI },
+        /* Diva Server 4BRI-8M PCI 0xE012 */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAQ),
+                CARDTYPE_DIVASRV_Q_8M_PCI },
+        /* Diva Server 4BRI-8M 2.0 PCI 0xE013 */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAQ_U),
+                CARDTYPE_DIVASRV_Q_8M_V2_PCI },
+        /* Diva Server PRI-30M PCI 0xE014 */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP),
+                CARDTYPE_DIVASRV_P_30M_PCI },
+        /* Diva Server PRI 2.0 adapter 0xE015 */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2),
+                CARDTYPE_DIVASRV_P_30M_V2_PCI },
+        /* Diva Server Voice 4BRI-8M PCI 0xE016 */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_4BRI_VOIP),
+                CARDTYPE_DIVASRV_VOICE_Q_8M_PCI },
+        /* Diva Server Voice 4BRI-8M 2.0 PCI 0xE017 */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_4BRI_2_VOIP),
+                CARDTYPE_DIVASRV_VOICE_Q_8M_V2_PCI },
+        /* Diva Server BRI-2M 2.0 PCI 0xE018 */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_BRI2M_2),
+                CARDTYPE_DIVASRV_B_2M_V2_PCI },
+        /* Diva Server Voice PRI 2.0 PCI 0xE019 */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2_VOIP),
+                CARDTYPE_DIVASRV_VOICE_P_30M_V2_PCI },
+        /* Diva Server 2FX 0xE01A */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_2F),
+                CARDTYPE_DIVASRV_B_2F_PCI },
+        /* Diva Server Voice BRI-2M 2.0 PCI 0xE01B */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_BRI2M_2_VOIP),
+                CARDTYPE_DIVASRV_VOICE_B_2M_V2_PCI },
+        { 0, }                  /* 0 terminated list. */
 };
 MODULE_DEVICE_TABLE(pci, divas_pci_tbl);
 
@@ -581,7 +579,6 @@ xdi_copy_from_user(void *os_handle, void *dst, const void __user *src, int lengt
  */
 static int divas_open(struct inode *inode, struct file *file)
 {
-        cycle_kernel_lock();
         return (0);
 }
 
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 095ed76ebe80..987fb1824f08 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5354,12 +5354,9 @@ static struct pci_device_id hfmultipci_ids[] __devinitdata = {
         { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFCE1, PCI_VENDOR_ID_CCD,
                 PCI_SUBDEVICE_ID_CCD_JHSE1, 0, 0, H(25)}, /* Junghanns E1 */
 
-        { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, 0},
-        { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, 0},
-        { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFCE1, PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, 0},
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_HFC4S), 0 },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_HFC8S), 0 },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_HFCE1), 0 },
         {0, }
 };
 #undef H
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 5940a2c12074..10757abac0ba 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -2188,52 +2188,52 @@ static const struct _hfc_map hfc_map[] =
 
 static struct pci_device_id hfc_ids[] =
 {
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[0]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[1]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[2]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[3]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[4]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[5]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[6]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[7]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[8]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[9]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[10]},
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[11]},
-        {PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[12]},
-        {PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[13]},
-        {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[14]},
-        {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[15]},
-        {PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[16]},
-        {PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[17]},
-        {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[18]},
-        {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[19]},
-        {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[20]},
-        {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},
-        {PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_2BD0),
+                (unsigned long) &hfc_map[0] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B000),
+                (unsigned long) &hfc_map[1] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B006),
+                (unsigned long) &hfc_map[2] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B007),
+                (unsigned long) &hfc_map[3] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B008),
+                (unsigned long) &hfc_map[4] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B009),
+                (unsigned long) &hfc_map[5] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00A),
+                (unsigned long) &hfc_map[6] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00B),
+                (unsigned long) &hfc_map[7] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00C),
+                (unsigned long) &hfc_map[8] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B100),
+                (unsigned long) &hfc_map[9] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B700),
+                (unsigned long) &hfc_map[10] },
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B701),
+                (unsigned long) &hfc_map[11] },
+        { PCI_VDEVICE(ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1),
+                (unsigned long) &hfc_map[12] },
+        { PCI_VDEVICE(ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675),
+                (unsigned long) &hfc_map[13] },
+        { PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT),
+                (unsigned long) &hfc_map[14] },
+        { PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_A1T),
+                (unsigned long) &hfc_map[15] },
+        { PCI_VDEVICE(ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575),
+                (unsigned long) &hfc_map[16] },
+        { PCI_VDEVICE(ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0),
+                (unsigned long) &hfc_map[17] },
+        { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E),
+                (unsigned long) &hfc_map[18] },
+        { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_E),
+                (unsigned long) &hfc_map[19] },
+        { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A),
+                (unsigned long) &hfc_map[20] },
+        { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_A),
+                (unsigned long) &hfc_map[21] },
+        { PCI_VDEVICE(SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2),
+                (unsigned long) &hfc_map[22] },
         {},
 };
 
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index f5b3d2b26a08..2a2181d58deb 100644
--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -125,36 +125,25 @@ struct inf_hw {
 #define PCI_SUB_ID_SEDLBAUER            0x01
 
 static struct pci_device_id infineon_ids[] __devinitdata = {
-        { PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA20},
-        { PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA20U},
-        { PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA201},
-        { PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA202},
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20), INF_DIVA20 },
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20_U), INF_DIVA20U },
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA201), INF_DIVA201 },
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA202), INF_DIVA202 },
         { PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100,
           PCI_SUBVENDOR_SEDLBAUER_PCI, PCI_SUB_ID_SEDLBAUER, 0, 0,
-          INF_SPEEDWIN},
+          INF_SPEEDWIN },
         { PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100,
-          PCI_SUBVENDOR_HST_SAPHIR3, PCI_SUB_ID_SEDLBAUER, 0, 0, INF_SAPHIR3},
-        { PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_QS1000},
-        { PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_QS3000,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_QS3000},
-        { PCI_VENDOR_ID_SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_NICCY},
+          PCI_SUBVENDOR_HST_SAPHIR3, PCI_SUB_ID_SEDLBAUER, 0, 0, INF_SAPHIR3 },
+        { PCI_VDEVICE(ELSA, PCI_DEVICE_ID_ELSA_MICROLINK), INF_QS1000 },
+        { PCI_VDEVICE(ELSA, PCI_DEVICE_ID_ELSA_QS3000), INF_QS3000 },
+        { PCI_VDEVICE(SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY), INF_NICCY },
         { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
           PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO, 0, 0,
-          INF_SCT_1},
-        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R685,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R685},
-        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R753,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R753},
-        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R753},
-        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_OLITEC,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R753},
+          INF_SCT_1 },
+        { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_R685), INF_GAZEL_R685 },
+        { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_R753), INF_GAZEL_R753 },
+        { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO), INF_GAZEL_R753 },
+        { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_OLITEC), INF_GAZEL_R753 },
         { }
 };
 MODULE_DEVICE_TABLE(pci, infineon_ids);