staging: remove DEFINE_PCI_DEVICE_TABLE macro

Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is not preferred.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c
index 432e3f9c3301ecc7ce6f6d633913bf1e1e85f4e4..ec14acb653c2bfe0b14b526edaf526584d2e6d30 100644 (file)
--- a/drivers/staging/comedi/drivers/8255_pci.c
+++ b/drivers/staging/comedi/drivers/8255_pci.c
@@ -257,7 +257,7 @@ static int pci_8255_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &pci_8255_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = {
+static const struct pci_device_id pci_8255_pci_table[] = {
        { PCI_VDEVICE(ADLINK, 0x7224), BOARD_ADLINK_PCI7224 },
        { PCI_VDEVICE(ADLINK, 0x7248), BOARD_ADLINK_PCI7248 },
        { PCI_VDEVICE(ADLINK, 0x7296), BOARD_ADLINK_PCI7296 },

diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index 8d229b2f09738cff65a558f8803ee83300b2f87e..ccd49211ea17d08c2c936078a77f3c9250c13d58 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -58,7 +58,7 @@ static int apci035_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci035_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci035_pci_table) = {
+static const struct pci_device_id apci035_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA,  0x0300) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 34ab0679e99281ee93b4a68f6213357827a21142..af2306c1b649b5d56f11c9aa9a37bef9e5f64abf 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -364,7 +364,7 @@ static int apci1032_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci1032_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci1032_pci_table) = {
+static const struct pci_device_id apci1032_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index ae9ded63dcecd097a8ccbf8514fae567c365becf..74f7ace8adbcb693abb8c3394e2cbfcc9e5e2427 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -57,7 +57,7 @@ static int apci1500_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci1500_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci1500_pci_table) = {
+static const struct pci_device_id apci1500_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMCC, 0x80fc) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 9d1b1425c60b7c8ec41f574df4f733687820c688..e9c5291c77cd439d1a6733c2b6b7a0604a6dd671 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -206,7 +206,7 @@ static int apci1516_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci1516_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci1516_pci_table) = {
+static const struct pci_device_id apci1516_pci_table[] = {
        { PCI_VDEVICE(ADDIDATA, 0x1000), BOARD_APCI1016 },
        { PCI_VDEVICE(ADDIDATA, 0x1001), BOARD_APCI1516 },
        { PCI_VDEVICE(ADDIDATA, 0x1002), BOARD_APCI2016 },

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index c5717d63e16a7bd6d4f5dc7a3a7333a414aed4ce..6248284caaf5c8bcb1611a165a6e1710429e3740 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -55,7 +55,7 @@ static int apci1564_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci1564_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci1564_pci_table) = {
+static const struct pci_device_id apci1564_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index 5ee204bcbeef3a5577547c34d04c24f378b87464..28df4b50b87adb1251cf6934a2c6ba7f15671381 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -168,7 +168,7 @@ static int apci16xx_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci16xx_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci16xx_pci_table) = {
+static const struct pci_device_id apci16xx_pci_table[] = {
        { PCI_VDEVICE(ADDIDATA, 0x1009), BOARD_APCI1648 },
        { PCI_VDEVICE(ADDIDATA, 0x100a), BOARD_APCI1696 },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index c77ee8732d38fe158f974a29ff5f0f2921afc609..c9b933cb5987c069fad52c98f64a8894e94f4f0c 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -359,7 +359,7 @@ static int apci2032_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci2032_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci2032_pci_table) = {
+static const struct pci_device_id apci2032_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1004) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c
index 7fb32e778d8ba5742565c3aaf508557dca385807..e1a916546d18a3dbc67604c2fb5e7b6ce1299666 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -134,7 +134,7 @@ static int apci2200_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci2200_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci2200_pci_table) = {
+static const struct pci_device_id apci2200_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1005) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 67d09e8afb2efdbcf8c21677f884a135c59a5e8b..1e6fa56c516e8bb5e97b2cee9deb49705e3124e5 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -230,7 +230,7 @@ static int apci3120_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci3120_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci3120_pci_table) = {
+static const struct pci_device_id apci3120_pci_table[] = {
        { PCI_VDEVICE(AMCC, 0x818d), BOARD_APCI3120 },
        { PCI_VDEVICE(AMCC, 0x828d), BOARD_APCI3001 },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c
index 1213d5aa6bea9b19c60d2beb97ab8164b3b008b9..9868a5369aff310b9596566139d0d0ad55147fb2 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3200.c
@@ -109,7 +109,7 @@ static int apci3200_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci3200_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci3200_pci_table) = {
+static const struct pci_device_id apci3200_pci_table[] = {
        { PCI_VDEVICE(ADDIDATA, 0x3000), BOARD_APCI3200 },
        { PCI_VDEVICE(ADDIDATA, 0x3007), BOARD_APCI3300 },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index 6138440b919e86dc94ea6c80f06c6573c079bb0b..4cb69ec54c9bc652ee6e02a6b564a2fe1cd79423 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -428,7 +428,7 @@ static int apci3501_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci3501_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci3501_pci_table) = {
+static const struct pci_device_id apci3501_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 761cbf8f964b3c69b96c84baab5d9c21d7829454..ceadf8eff47f572d0f0be5345356a0cc5bcc221e 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -915,7 +915,7 @@ static int apci3xxx_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &apci3xxx_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(apci3xxx_pci_table) = {
+static const struct pci_device_id apci3xxx_pci_table[] = {
        { PCI_VDEVICE(ADDIDATA, 0x3010), BOARD_APCI3000_16 },
        { PCI_VDEVICE(ADDIDATA, 0x300f), BOARD_APCI3000_8 },
        { PCI_VDEVICE(ADDIDATA, 0x300e), BOARD_APCI3000_4 },

diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index dd092c7954a9ef88e209b0f5392c6683b4618344..5c1413abc52de18ff6ab051c9e394a6b6038e690 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -242,7 +242,7 @@ static int adl_pci6208_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(adl_pci6208_pci_table) = {
+static const struct pci_device_id adl_pci6208_pci_table[] = {
        { PCI_VDEVICE(ADLINK, 0x6208), BOARD_PCI6208 },
        { PCI_VDEVICE(ADLINK, 0x6216), BOARD_PCI6216 },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/adl_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c
index 5617f5ca384a0bd8fd463c85dca28357bb025a2a..6f622b4de698604104ea24a20635b43332573344 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7x3x.c
+++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c
@@ -259,7 +259,7 @@ static int adl_pci7x3x_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(adl_pci7x3x_pci_table) = {
+static const struct pci_device_id adl_pci7x3x_pci_table[] = {
        { PCI_VDEVICE(ADLINK, 0x7230), BOARD_PCI7230 },
        { PCI_VDEVICE(ADLINK, 0x7233), BOARD_PCI7233 },
        { PCI_VDEVICE(ADLINK, 0x7234), BOARD_PCI7234 },

diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index b3d009285ed4ce0afdefee26243d734191a4f114..300df55a2802d21d6b0f3161498f7eba4fb90cb7 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -145,7 +145,7 @@ static int adl_pci8164_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(adl_pci8164_pci_table) = {
+static const struct pci_device_id adl_pci8164_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, 0x8164) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index eab8da2c3d66910b23ef26cc5fceac488843a114..03b38ea92cb0c28766a8b90c1bdd295262c617f2 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -938,7 +938,7 @@ static int pci9111_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(pci9111_pci_table) = {
+static const struct pci_device_id pci9111_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID) },
        /* { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID) }, */
        { 0 }

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 986489641ed774a5c7d79380288339ea0be5dd33..97343cc4051556fd0bc22a6a0b8aaa22238a5997 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -2217,7 +2217,7 @@ static int adl_pci9118_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(adl_pci9118_pci_table) = {
+static const struct pci_device_id adl_pci9118_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMCC, 0x80d9) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index c3fdcabe9aec6ac77626e0cecee123dc9d7c597e..bac5e0dcc685a7cbc68313b9ee8cdbd6011fa467 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1374,7 +1374,7 @@ static int adv_pci1710_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(adv_pci1710_pci_table) = {
+static const struct pci_device_id adv_pci1710_pci_table[] = {
        {
                PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
                               PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050),

diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index bd4f781b4b24a0ac66896c05f15b2c102f69f555..72394267ddfeb39d46bceb855223a17f3eef6727 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -306,7 +306,7 @@ static int adv_pci1723_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(adv_pci1723_pci_table) = {
+static const struct pci_device_id adv_pci1723_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1723) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c
index 009a3039fc4fef4ce23e13aba09023795e4eadc3..56f2d97b3a46c5d98a321a12dd56609d9556f530 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1724.c
+++ b/drivers/staging/comedi/drivers/adv_pci1724.c
@@ -381,7 +381,7 @@ static int adv_pci1724_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(adv_pci1724_pci_table) = {
+static const struct pci_device_id adv_pci1724_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1724) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 6bac665261f847c750299a9979bb140d7c83784c..d4bd61d84dafc0fc14b4d836cf4fd7e6bc8f8647 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -1188,7 +1188,7 @@ static int adv_pci_dio_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &adv_pci_dio_driver, cardtype);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(adv_pci_dio_pci_table) = {
+static const struct pci_device_id adv_pci_dio_pci_table[] = {
        { PCI_VDEVICE(ADVANTECH, 0x1730), TYPE_PCI1730 },
        { PCI_VDEVICE(ADVANTECH, 0x1733), TYPE_PCI1733 },
        { PCI_VDEVICE(ADVANTECH, 0x1734), TYPE_PCI1734 },

diff --git a/drivers/staging/comedi/drivers/amplc_dio200_pci.c b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
index a810a24164432889db869669b0930432b9d57370..e0367380b37aa3a4c0b54ff16b068fcefcd518c2 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_dio200_pci.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
@@ -439,7 +439,7 @@ static struct comedi_driver dio200_pci_comedi_driver = {
        .detach = dio200_pci_detach,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {
+static const struct pci_device_id dio200_pci_table[] = {
        {
                PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215),
                pci215_model

diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 98075f999c9fdb6f97b21edd75c72e46b9d95b38..eaf21ce37ed5f2fa3c8b5182b1e9f0b51be92689 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -567,7 +567,7 @@ static struct comedi_driver amplc_pc236_driver = {
 };
 
 #if DO_PCI
-static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = {
+static const struct pci_device_id pc236_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236) },
        {0}
 };

diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index dcccdce53c185bb5e07b78b2811764906f0620eb..230a0103497b86771b6d6793bd9c89c7264bcca6 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -1496,7 +1496,7 @@ static int amplc_pci224_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(amplc_pci224_pci_table) = {
+static const struct pci_device_id amplc_pci224_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224) },
        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234) },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index e11d7cec11e682a7c024d50349803f7cad65c3fc..58e7a43586e6e91f9679c048b5127e211130d3a6 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -2852,7 +2852,7 @@ static int amplc_pci230_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(amplc_pci230_pci_table) = {
+static const struct pci_device_id amplc_pci230_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230) },
        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260) },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/amplc_pci263.c b/drivers/staging/comedi/drivers/amplc_pci263.c
index 4bd4ef8e88cd05dbf6453fb88f988196c5eb5174..be28e6cbea2065a63f689c89a45a92184e189d79 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci263.c
+++ b/drivers/staging/comedi/drivers/amplc_pci263.c
@@ -96,7 +96,7 @@ static struct comedi_driver amplc_pci263_driver = {
        .detach         = comedi_pci_disable,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(pci263_pci_table) = {
+static const struct pci_device_id pci263_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263) },
        {0}
 };

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index e72a403db17ca8e0f0d7715791ef1ff8d27223b0..22c1623c048b260e257decf0ae0af816b72cffbc 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -1614,7 +1614,7 @@ static int cb_pcidas_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(cb_pcidas_pci_table) = {
+static const struct pci_device_id cb_pcidas_pci_table[] = {
        { PCI_VDEVICE(CB, 0x0001), BOARD_PCIDAS1602_16 },
        { PCI_VDEVICE(CB, 0x000f), BOARD_PCIDAS1200 },
        { PCI_VDEVICE(CB, 0x0010), BOARD_PCIDAS1602_12 },

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index a0053bbb2ede77d4d47fc925b48aec36d4b7e32f..0fcedd050425e8c622641eca385471a3d609bfe3 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -4041,7 +4041,7 @@ static int cb_pcidas64_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(cb_pcidas64_pci_table) = {
+static const struct pci_device_id cb_pcidas64_pci_table[] = {
        { PCI_VDEVICE(CB, 0x001d), BOARD_PCIDAS6402_16 },
        { PCI_VDEVICE(CB, 0x001e), BOARD_PCIDAS6402_12 },
        { PCI_VDEVICE(CB, 0x0035), BOARD_PCIDAS64_M1_16 },

diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 94f11582027901973a03ee5b2b78f7e658d52651..8cca0518cfda780781ed352120187931732f026e 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -407,7 +407,7 @@ static int cb_pcidda_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(cb_pcidda_pci_table) = {
+static const struct pci_device_id cb_pcidda_pci_table[] = {
        { PCI_VDEVICE(CB, 0x0020), BOARD_DDA02_12 },
        { PCI_VDEVICE(CB, 0x0021), BOARD_DDA04_12 },
        { PCI_VDEVICE(CB, 0x0022), BOARD_DDA08_12 },

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index b25fa5d6e1e8f02907b00b3abad53f261e26bad4..04dc2005454ac266e5c5c6d61730c3301d3e5ecd 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -285,7 +285,7 @@ static int cb_pcimdas_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(cb_pcimdas_pci_table) = {
+static const struct pci_device_id cb_pcimdas_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index edf17b63096fa60cace0a3272841bb499c95c38b..43a86630a66e0c4bb53bf0571b3a67381aa929f1 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -206,7 +206,7 @@ static int cb_pcimdda_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(cb_pcimdda_pci_table) = {
+static const struct pci_device_id cb_pcimdda_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_ID_PCIM_DDA06_16) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index 89836c0828d9cb08a8626cecbe9fd266bf38f9d2..323a7f39cd97ae377249da3e13d97021095f3e2b 100644 (file)
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -111,7 +111,7 @@ static int contec_pci_dio_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(contec_pci_dio_pci_table) = {
+static const struct pci_device_id contec_pci_dio_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_CONTEC, PCI_DEVICE_ID_PIO1616L) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index de920ccff400fb70c1f3bf147ead833aca5f3764..ce153fcb8b2af81a2262a2ba0f1476eb16344b08 100644 (file)
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -772,7 +772,7 @@ static int daqboard2000_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(daqboard2000_pci_table) = {
+static const struct pci_device_id daqboard2000_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_IOTECH, 0x0409) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/das08_pci.c b/drivers/staging/comedi/drivers/das08_pci.c
index 3a6d3725b25f90a286c93bd2e16f813cc914c7be..d94af09151b05db11239c35dd923e7ca596b243f 100644 (file)
--- a/drivers/staging/comedi/drivers/das08_pci.c
+++ b/drivers/staging/comedi/drivers/das08_pci.c
@@ -89,7 +89,7 @@ static int das08_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(das08_pci_table) = {
+static const struct pci_device_id das08_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_PCIDAS08) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 3073efd792480cc8dfdde65ee4797b4f529d41a2..1410943807b9d90d1a253db8c2746503978feb25 100644 (file)
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -795,7 +795,7 @@ static int dt3000_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &dt3000_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(dt3000_pci_table) = {
+static const struct pci_device_id dt3000_pci_table[] = {
        { PCI_VDEVICE(DT, 0x0022), BOARD_DT3001 },
        { PCI_VDEVICE(DT, 0x0023), BOARD_DT3002 },
        { PCI_VDEVICE(DT, 0x0024), BOARD_DT3003 },

diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 9b1f196dbbc8c2e2563e06a387795934789e9f44..8fd705cb235b0ffa8da80d501bceee950f408cb8 100644 (file)
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -259,7 +259,7 @@ static int dyna_pci10xx_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = {
+static const struct pci_device_id dyna_pci10xx_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_PLX, 0x1050) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 4fcf3c876ac90754b51b66fb464ce2e470ee448b..de60a2871d70ef58d0c0ea15ae7a0de5aa2d518c 100644 (file)
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -836,7 +836,7 @@ static int gsc_hpdi_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &gsc_hpdi_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(gsc_hpdi_pci_table) = {
+static const struct pci_device_id gsc_hpdi_pci_table[] = {
        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9080, PCI_VENDOR_ID_PLX,
                    0x2400, 0, 0, 0},
        { 0 }

diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index 1e16641ec52d6991bce167d633a03f475f73a936..e00aa9089e5f1e69a68e2b129a0c751bf077e676 100644 (file)
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -597,7 +597,7 @@ static int icp_multi_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &icp_multi_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(icp_multi_pci_table) = {
+static const struct pci_device_id icp_multi_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ICP, PCI_DEVICE_ID_ICP_MULTI) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index b52d58e5de276b204978d5ea4d12e9c030d8cd97..6100c12c164f4c697bf21ebfb85727966a3dd23f 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -807,7 +807,7 @@ static int jr3_pci_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &jr3_pci_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {
+static const struct pci_device_id jr3_pci_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL) },
        { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW) },
        { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL) },

diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 15589f62a619923ab1fdaaf94db350c75a10bdfd..6b9846fd8c485bfc40c5cae33b73f4198aabeee9 100644 (file)
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -139,7 +139,7 @@ static int ke_counter_pci_probe(struct pci_dev *dev,
                                      id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ke_counter_pci_table) = {
+static const struct pci_device_id ke_counter_pci_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_KOLTER, CNT_CARD_DEVICE_ID) },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 3d12e913592649f3eb4c1dc999058695f27b8a86..081a31004801256d488df1c9f31dd0f76b273380 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -1635,7 +1635,7 @@ static int me4000_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &me4000_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(me4000_pci_table) = {
+static const struct pci_device_id me4000_pci_table[] = {
        { PCI_VDEVICE(MEILHAUS, 0x4650), BOARD_ME4650 },
        { PCI_VDEVICE(MEILHAUS, 0x4660), BOARD_ME4660 },
        { PCI_VDEVICE(MEILHAUS, 0x4661), BOARD_ME4660I },

diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 24ec9ef9b1a0fc326ac560aa74a5b57105fd2647..7f6687896401124f89d9cc0e95221a9fc84ebef7 100644 (file)
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -576,7 +576,7 @@ static int me_daq_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &me_daq_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(me_daq_pci_table) = {
+static const struct pci_device_id me_daq_pci_table[] = {
        { PCI_VDEVICE(MEILHAUS, 0x2600), BOARD_ME2600 },
        { PCI_VDEVICE(MEILHAUS, 0x2000), BOARD_ME2000 },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 85aa9609d6a280994bffaa8ad72f0eac5c3c3861..860fc81fb11c62bbaabcd714f1dfb2992d729734 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -455,7 +455,7 @@ static int ni6527_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &ni6527_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = {
+static const struct pci_device_id ni6527_pci_table[] = {
        { PCI_VDEVICE(NI, 0x2b10), BOARD_PXI6527 },
        { PCI_VDEVICE(NI, 0x2b20), BOARD_PCI6527 },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index aae708bfbe15333d7bfd030c17e3ddccfd3ef439..effa12482c8d4bc1012282918ac2a74a6e0f3c74 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -738,7 +738,7 @@ static int ni_65xx_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &ni_65xx_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ni_65xx_pci_table) = {
+static const struct pci_device_id ni_65xx_pci_table[] = {
        { PCI_VDEVICE(NI, 0x1710), BOARD_PXI6509 },
        { PCI_VDEVICE(NI, 0x7085), BOARD_PCI6509 },
        { PCI_VDEVICE(NI, 0x7086), BOARD_PXI6528 },

diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 8a991dcab24a9b5a08cdcaf480979292337db555..61c64a9e3c30bec1fa077946314ce12fe86d70bb 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -1320,7 +1320,7 @@ static int ni_660x_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &ni_660x_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = {
+static const struct pci_device_id ni_660x_pci_table[] = {
        { PCI_VDEVICE(NI, 0x1310), BOARD_PCI6602 },
        { PCI_VDEVICE(NI, 0x1360), BOARD_PXI6602 },
        { PCI_VDEVICE(NI, 0x2c60), BOARD_PCI6601 },

diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index e4414cf110e7e3a72e049d48d0c00c32a7e7d6c6..8550fdc4ccd38b8e3c7fca213bee963c4b123158 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -282,7 +282,7 @@ static int ni_670x_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &ni_670x_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ni_670x_pci_table) = {
+static const struct pci_device_id ni_670x_pci_table[] = {
        { PCI_VDEVICE(NI, 0x1290), BOARD_PCI6704 },
        { PCI_VDEVICE(NI, 0x1920), BOARD_PXI6704 },
        { PCI_VDEVICE(NI, 0x2c90), BOARD_PCI6703 },

diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c b/drivers/staging/comedi/drivers/ni_labpc_pci.c
index 8be681fca9078b15664eae20b82bcfa606daa3b5..739597068297d2d2ee7c87415846afc8c6f6806d 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_pci.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c
@@ -107,7 +107,7 @@ static struct comedi_driver labpc_pci_comedi_driver = {
        .detach         = labpc_pci_detach,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = {
+static const struct pci_device_id labpc_pci_table[] = {
        { PCI_VDEVICE(NI, 0x161), BOARD_NI_PCI1200 },
        { 0 }
 };

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index c7bc23044568e101a9ea8608611b1f47231808a4..313b436617bb301a9713a893fb6759d31d17fa26 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -1075,7 +1075,7 @@ static int ni_pcidio_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &ni_pcidio_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ni_pcidio_pci_table) = {
+static const struct pci_device_id ni_pcidio_pci_table[] = {
        { PCI_VDEVICE(NI, 0x1150), BOARD_PCIDIO_32HS },
        { PCI_VDEVICE(NI, 0x12b0), BOARD_PCI6534 },
        { PCI_VDEVICE(NI, 0x1320), BOARD_PXI6533 },

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index aa002b275458b22676a7d26ca73fbf16b592835f..b0ed0413bd0fa9c0f6a7686e35986085bfee0d19 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1637,7 +1637,7 @@ static int ni_pcimio_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &ni_pcimio_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ni_pcimio_pci_table) = {
+static const struct pci_device_id ni_pcimio_pci_table[] = {
        { PCI_VDEVICE(NI, 0x0162), BOARD_PCIMIO_16XE_50 },      /* 0x1620? */
        { PCI_VDEVICE(NI, 0x1170), BOARD_PCIMIO_16XE_10 },
        { PCI_VDEVICE(NI, 0x1180), BOARD_PCIMIO_16E_1 },

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 44c8712ed9e05ddf939f1792dd452b94d2e7044f..a1e4892eac31eaef1061453ec4a317b828b56eaf 100644 (file)
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1427,7 +1427,7 @@ static int rtd520_pci_probe(struct pci_dev *dev,
        return comedi_pci_auto_config(dev, &rtd520_driver, id->driver_data);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(rtd520_pci_table) = {
+static const struct pci_device_id rtd520_pci_table[] = {
        { PCI_VDEVICE(RTD, 0x7520), BOARD_DM7520 },
        { PCI_VDEVICE(RTD, 0x4520), BOARD_PCI4520 },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index b486099b543d56e61a14e94b3bc698c58cc04cb0..6d266235ae4f820d175c285a5db3ba1c2f3101ee 100644 (file)
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2965,7 +2965,7 @@ static int s626_pci_probe(struct pci_dev *dev,
  * also subvendor:subdevice ids, because otherwise it will conflict with
  * Philips SAA7146 media/dvb based cards.
  */
-static DEFINE_PCI_DEVICE_TABLE(s626_pci_table) = {
+static const struct pci_device_id s626_pci_table[] = {
        { PCI_DEVICE_SUB(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146,
                         0x6000, 0x0272) },
        { 0 }

diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index daee2f42bde0632c2cd05a38640ba1346a7bfeb6..77e2059ff62e0bb5c9413c5cde95cf9303f239fe 100644 (file)
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -698,7 +698,7 @@ static int skel_pci_probe(struct pci_dev *dev,
  * This is used by modprobe to translate PCI IDs to drivers.
  * Should only be used for PCI and ISA-PnP devices
  */
-static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = {
+static const struct pci_device_id skel_pci_table[] = {
        { PCI_VDEVICE(SKEL, 0x0100), BOARD_SKEL100 },
        { PCI_VDEVICE(SKEL, 0x0200), BOARD_SKEL200 },
        { 0 }

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index 190b9b924368843f6f688a8ea32819ea329d8af9..99eefd0291c31503199621dfa9bcb9d7e3438d21 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -703,7 +703,7 @@ static int chd_dec_pci_resume(struct pci_dev *pdev)
 }
 #endif
 
-static DEFINE_PCI_DEVICE_TABLE(chd_dec_pci_id_table) = {
+static const struct pci_device_id chd_dec_pci_id_table[] = {
        { PCI_VDEVICE(BROADCOM, 0x1612), 8 },
        { 0, },
 };

diff --git a/drivers/staging/dwc2/pci.c b/drivers/staging/dwc2/pci.c
index 3d14c8870fcac75f6f1e6af1ef315b49c23778a7..c291fca5d21fc048a089ec002104ccf11619cded 100644 (file)
--- a/drivers/staging/dwc2/pci.c
+++ b/drivers/staging/dwc2/pci.c
@@ -152,7 +152,7 @@ static int dwc2_driver_probe(struct pci_dev *dev,
        return retval;
 }
 
-static DEFINE_PCI_DEVICE_TABLE(dwc2_pci_ids) = {
+static const struct pci_device_id dwc2_pci_ids[] = {
        {
                PCI_DEVICE(PCI_VENDOR_ID_SYNOPSYS, PCI_PRODUCT_ID_HAPS_HSOTG),
        },

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index ab8b29d2cb2609d3c19bd5d3dddfdbdbdc0c98e2..ca36b04d3c1b357957207f6685b46aff687e276e 100644 (file)
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -4930,7 +4930,7 @@ err_disable:
        goto out;
 }
 
-static DEFINE_PCI_DEVICE_TABLE(et131x_pci_table) = {
+static const struct pci_device_id et131x_pci_table[] = {
        { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_GIG), 0UL},
        { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_FAST), 0UL},
        {0,}

diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 081407be33ab5b6cdec1a01dbfb561bd53056c78..e729e52639c59bf62f56cf8cd825e6a2a638a2f3 100644 (file)
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -974,7 +974,7 @@ dt3155_remove(struct pci_dev *pdev)
        kfree(pd);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
+static const struct pci_device_id pci_ids[] = {
        { PCI_DEVICE(DT3155_VENDOR_ID, DT3155_DEVICE_ID) },
        { 0, /* zero marks the end */ },
 };

diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
index 36750205d23fbc507a6c0fa68f9c99eb5370cd4b..480b7c4064cc3dacc0b40523810f29f97fb283c0 100644 (file)
--- a/drivers/staging/media/solo6x10/solo6x10-core.c
+++ b/drivers/staging/media/solo6x10/solo6x10-core.c
@@ -669,7 +669,7 @@ static void solo_pci_remove(struct pci_dev *pdev)
        free_solo_dev(solo_dev);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(solo_id_table) = {
+static const struct pci_device_id solo_id_table[] = {
        /* 6010 based cards */
        { PCI_DEVICE(PCI_VENDOR_ID_SOFTLOGIC, PCI_DEVICE_ID_SOLO6010),
          .driver_data = SOLO_DEV_6010 },

diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c
index 919cb95236fc5f84a3533b7037d22d5b19ca6fc2..57fc279587970ab798ec7923bd6cba8a546a1766 100644 (file)
--- a/drivers/staging/phison/phison.c
+++ b/drivers/staging/phison/phison.c
@@ -69,7 +69,7 @@ static int phison_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
        return ret;
 }
 
-static DEFINE_PCI_DEVICE_TABLE(phison_pci_tbl) = {
+static const struct pci_device_id phison_pci_tbl[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000),
          PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 },
        { 0, },

diff --git a/drivers/staging/sep/sep_main.c b/drivers/staging/sep/sep_main.c
index 1e80a4013b8c1f4e2947280bd5a2ea0448921ccf..dca838d043e597a5f1be52acd0e0d99744ecb6f5 100644 (file)
--- a/drivers/staging/sep/sep_main.c
+++ b/drivers/staging/sep/sep_main.c
@@ -4292,7 +4292,7 @@ static void sep_remove(struct pci_dev *pdev)
 }
 
 /* Initialize struct pci_device_id for our driver */
-static DEFINE_PCI_DEVICE_TABLE(sep_pci_id_tbl) = {
+static const struct pci_device_id sep_pci_id_tbl[] = {
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0826)},
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x08e9)},
        {0}

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 652272b96a56c68a51d1031cc60c315add73cb08..f340cb9a90ff175daf4f487499d1f6348ffefad6 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -136,7 +136,7 @@ MODULE_PARM_DESC(dynamic_intagg, "Dynamic Interrupt Aggregation Setting");
 module_param(intagg_delay, int, 0);
 MODULE_PARM_DESC(intagg_delay, "uSec Interrupt Aggregation Delay");
 
-static DEFINE_PCI_DEVICE_TABLE(slic_pci_tbl) = {
+static const struct pci_device_id slic_pci_tbl[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_1GB_DEVICE_ID) },
        { PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_2GB_DEVICE_ID) },
        { 0 }

diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index ba199ffff1783cbf08a8892960f3a44c8bbd68cf..805c3fa36d8fdd13b179c0329ffbc7ee131e47ae 100644 (file)
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -920,7 +920,7 @@ failed_free:
  * 0x712 (LynxEM+)
  * 0x720 (Lynx3DM, Lynx3DM+)
  */
-static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = {
+static const struct pci_device_id smtcfb_pci_table[] = {
        { PCI_DEVICE(0x126f, 0x710), },
        { PCI_DEVICE(0x126f, 0x712), },
        { PCI_DEVICE(0x126f, 0x720), },

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 68cbaee2977518670a7bf608cfe889cf18fb40e6..a952df1bf9d654d10072f3fd021e61a220377c15 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -267,7 +267,7 @@ static CHIP_INFO chip_info_table[] = {
        {0, NULL}
 };
 
-DEFINE_PCI_DEVICE_TABLE(vt6655_pci_id_table) = {
+const struct pci_device_id vt6655_pci_id_table[] = {
        { PCI_VDEVICE(VIA, 0x3253), (kernel_ulong_t)chip_info_table},
        { 0, }
 };

diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index c033da408a58105efcd6d2d77afab2c3de4850c5..95ce9708cec915056283c8767e3c3d20859aedc0 100644 (file)
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -11,7 +11,7 @@
 #define PCI_DEVICE_ID_XGI_27      0x027
 #endif
 
-static DEFINE_PCI_DEVICE_TABLE(xgifb_pci_table) = {
+static const struct pci_device_id xgifb_pci_table[] = {
        {PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_20)},
        {PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_27)},
        {PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_40)},

diff --git a/drivers/staging/xillybus/xillybus_pcie.c b/drivers/staging/xillybus/xillybus_pcie.c
index 1811aa76421384aedf3e47eb62e8e60e0ea6b6b4..0564f97bdde41df513d8e350bfd59ef8bdf5770b 100644 (file)
--- a/drivers/staging/xillybus/xillybus_pcie.c
+++ b/drivers/staging/xillybus/xillybus_pcie.c
@@ -30,7 +30,7 @@ MODULE_LICENSE("GPL v2");
 
 static const char xillyname[] = "xillybus_pcie";
 
-static DEFINE_PCI_DEVICE_TABLE(xillyids) = {
+static const struct pci_device_id xillyids[] = {
        {PCI_DEVICE(PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_XILLYBUS)},
        {PCI_DEVICE(PCI_VENDOR_ID_ALTERA, PCI_DEVICE_ID_XILLYBUS)},
        {PCI_DEVICE(PCI_VENDOR_ID_ACTEL, PCI_DEVICE_ID_XILLYBUS)},