staging: comedi: remove use of __devexit_p
authorBill Pemberton <wfp5p@virginia.edu>
Mon, 19 Nov 2012 18:21:37 +0000 (13:21 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Nov 2012 22:14:56 +0000 (14:14 -0800)
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
53 files changed:
drivers/staging/comedi/drivers/8255_pci.c
drivers/staging/comedi/drivers/addi_apci_035.c
drivers/staging/comedi/drivers/addi_apci_1032.c
drivers/staging/comedi/drivers/addi_apci_1500.c
drivers/staging/comedi/drivers/addi_apci_1516.c
drivers/staging/comedi/drivers/addi_apci_1564.c
drivers/staging/comedi/drivers/addi_apci_16xx.c
drivers/staging/comedi/drivers/addi_apci_1710.c
drivers/staging/comedi/drivers/addi_apci_2032.c
drivers/staging/comedi/drivers/addi_apci_2200.c
drivers/staging/comedi/drivers/addi_apci_3120.c
drivers/staging/comedi/drivers/addi_apci_3200.c
drivers/staging/comedi/drivers/addi_apci_3501.c
drivers/staging/comedi/drivers/addi_apci_3xxx.c
drivers/staging/comedi/drivers/adl_pci6208.c
drivers/staging/comedi/drivers/adl_pci7x3x.c
drivers/staging/comedi/drivers/adl_pci8164.c
drivers/staging/comedi/drivers/adl_pci9111.c
drivers/staging/comedi/drivers/adl_pci9118.c
drivers/staging/comedi/drivers/adv_pci1710.c
drivers/staging/comedi/drivers/adv_pci1723.c
drivers/staging/comedi/drivers/adv_pci_dio.c
drivers/staging/comedi/drivers/amplc_dio200.c
drivers/staging/comedi/drivers/amplc_pc236.c
drivers/staging/comedi/drivers/amplc_pc263.c
drivers/staging/comedi/drivers/amplc_pci224.c
drivers/staging/comedi/drivers/amplc_pci230.c
drivers/staging/comedi/drivers/cb_pcidas.c
drivers/staging/comedi/drivers/cb_pcidas64.c
drivers/staging/comedi/drivers/cb_pcidda.c
drivers/staging/comedi/drivers/cb_pcimdas.c
drivers/staging/comedi/drivers/cb_pcimdda.c
drivers/staging/comedi/drivers/contec_pci_dio.c
drivers/staging/comedi/drivers/daqboard2000.c
drivers/staging/comedi/drivers/das08.c
drivers/staging/comedi/drivers/dt3000.c
drivers/staging/comedi/drivers/dyna_pci10xx.c
drivers/staging/comedi/drivers/gsc_hpdi.c
drivers/staging/comedi/drivers/icp_multi.c
drivers/staging/comedi/drivers/jr3_pci.c
drivers/staging/comedi/drivers/ke_counter.c
drivers/staging/comedi/drivers/me4000.c
drivers/staging/comedi/drivers/me_daq.c
drivers/staging/comedi/drivers/ni_6527.c
drivers/staging/comedi/drivers/ni_65xx.c
drivers/staging/comedi/drivers/ni_660x.c
drivers/staging/comedi/drivers/ni_670x.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/comedi/drivers/ni_pcidio.c
drivers/staging/comedi/drivers/ni_pcimio.c
drivers/staging/comedi/drivers/rtd520.c
drivers/staging/comedi/drivers/s626.c
drivers/staging/comedi/drivers/skel.c

index 71ad619d9c605586fedb16874bd763ceffc61aa8..c897d39f6b2b847ef62cdced0054e6320b480c9f 100644 (file)
@@ -342,7 +342,7 @@ static struct pci_driver pci_8255_pci_driver = {
        .name           = "8255_pci",
        .id_table       = pci_8255_pci_table,
        .probe          = pci_8255_pci_probe,
-       .remove         = __devexit_p(pci_8255_pci_remove),
+       .remove         = pci_8255_pci_remove,
 };
 module_comedi_pci_driver(pci_8255_driver, pci_8255_pci_driver);
 
index 3055fc2e0a7daedeac7636cf54a51b050a2c4eb1..489d151fc0370806557f6b0ac7c41c526129f0e6 100644 (file)
@@ -68,7 +68,7 @@ static struct pci_driver apci035_pci_driver = {
        .name           = "addi_apci_035",
        .id_table       = apci035_pci_table,
        .probe          = apci035_pci_probe,
-       .remove         = __devexit_p(apci035_pci_remove),
+       .remove         = apci035_pci_remove,
 };
 module_comedi_pci_driver(apci035_driver, apci035_pci_driver);
 
index 0f47113ee0b600d1f4029001560a1fa6009699a2..9c2e7f745d67aac77e63fa45dbfa45ea7f89ee1c 100644 (file)
@@ -390,7 +390,7 @@ static struct pci_driver apci1032_pci_driver = {
        .name           = "addi_apci_1032",
        .id_table       = apci1032_pci_table,
        .probe          = apci1032_pci_probe,
-       .remove         = __devexit_p(apci1032_pci_remove),
+       .remove         = apci1032_pci_remove,
 };
 module_comedi_pci_driver(apci1032_driver, apci1032_pci_driver);
 
index 8528b27f77e75b853dd9a37a332be13c6b3a35a6..67f145d92814a1c9f91e31b1576017d7ee343ddb 100644 (file)
@@ -68,7 +68,7 @@ static struct pci_driver apci1500_pci_driver = {
        .name           = "addi_apci_1500",
        .id_table       = apci1500_pci_table,
        .probe          = apci1500_pci_probe,
-       .remove         = __devexit_p(apci1500_pci_remove),
+       .remove         = apci1500_pci_remove,
 };
 module_comedi_pci_driver(apci1500_driver, apci1500_pci_driver);
 
index e6aa5226014d8f3f9fcd7155224bd730dfac1c59..086445f558f3a6daef23b16196915414b2a94757 100644 (file)
@@ -340,7 +340,7 @@ static struct pci_driver apci1516_pci_driver = {
        .name           = "addi_apci_1516",
        .id_table       = apci1516_pci_table,
        .probe          = apci1516_pci_probe,
-       .remove         = __devexit_p(apci1516_pci_remove),
+       .remove         = apci1516_pci_remove,
 };
 module_comedi_pci_driver(apci1516_driver, apci1516_pci_driver);
 
index 926fa088392f66e3150189bb9e4b7fd75f132e32..1d51233ca78e97b32732fab36a812729708baf7f 100644 (file)
@@ -65,7 +65,7 @@ static struct pci_driver apci1564_pci_driver = {
        .name           = "addi_apci_1564",
        .id_table       = apci1564_pci_table,
        .probe          = apci1564_pci_probe,
-       .remove         = __devexit_p(apci1564_pci_remove),
+       .remove         = apci1564_pci_remove,
 };
 module_comedi_pci_driver(apci1564_driver, apci1564_pci_driver);
 
index 170d576761a01ed5e9a97601be7fa6d9d1138216..07d7c9a5d6d19ed6df1d903c06961373fc79f3ce 100644 (file)
@@ -68,7 +68,7 @@ static struct pci_driver apci16xx_pci_driver = {
        .name           = "addi_apci_16xx",
        .id_table       = apci16xx_pci_table,
        .probe          = apci16xx_pci_probe,
-       .remove         = __devexit_p(apci16xx_pci_remove),
+       .remove         = apci16xx_pci_remove,
 };
 module_comedi_pci_driver(apci16xx_driver, apci16xx_pci_driver);
 
index 485f8214516f97bb5a13cabca865b988353c0612..5d263364dbc10e4cb6e246e6576a810aa1e58a85 100644 (file)
@@ -143,7 +143,7 @@ static struct pci_driver apci1710_pci_driver = {
        .name           = "addi_apci_1710",
        .id_table       = apci1710_pci_table,
        .probe          = apci1710_pci_probe,
-       .remove         = __devexit_p(apci1710_pci_remove),
+       .remove         = apci1710_pci_remove,
 };
 module_comedi_pci_driver(apci1710_driver, apci1710_pci_driver);
 
index 7758de3146e9e9985e2166a0ae3554a9d9c1607d..a80bf018b76274683886f6c90f5bb685e831f80b 100644 (file)
@@ -62,7 +62,7 @@ static struct pci_driver apci2032_pci_driver = {
        .name           = "addi_apci_2032",
        .id_table       = apci2032_pci_table,
        .probe          = apci2032_pci_probe,
-       .remove         = __devexit_p(apci2032_pci_remove),
+       .remove         = apci2032_pci_remove,
 };
 module_comedi_pci_driver(apci2032_driver, apci2032_pci_driver);
 
index 3041009915f0568b8ff050ac7962f0b480f5e057..9271cfe1b2388a0e3a9d2bd36d201f3b79814427 100644 (file)
@@ -60,7 +60,7 @@ static struct pci_driver apci2200_pci_driver = {
        .name           = "addi_apci_2200",
        .id_table       = apci2200_pci_table,
        .probe          = apci2200_pci_probe,
-       .remove         = __devexit_p(apci2200_pci_remove),
+       .remove         = apci2200_pci_remove,
 };
 module_comedi_pci_driver(apci2200_driver, apci2200_pci_driver);
 
index 34aab504d350a521d838f1d017cafb0384c6ee9c..77a9fe933f0680db481b27634e031dee0c7f74f3 100644 (file)
@@ -267,7 +267,7 @@ static struct pci_driver apci3120_pci_driver = {
        .name           = "addi_apci_3120",
        .id_table       = apci3120_pci_table,
        .probe          = apci3120_pci_probe,
-       .remove         = __devexit_p(apci3120_pci_remove),
+       .remove         = apci3120_pci_remove,
 };
 module_comedi_pci_driver(apci3120_driver, apci3120_pci_driver);
 
index e95141dabbd9416323ba512b91a53548ef2f1b88..59120cf88dbcefef54d6413a0b988fe19cba6d76 100644 (file)
@@ -115,6 +115,6 @@ static struct pci_driver apci3200_pci_driver = {
        .name           = "addi_apci_3200",
        .id_table       = apci3200_pci_table,
        .probe          = apci3200_pci_probe,
-       .remove         = __devexit_p(apci3200_pci_remove),
+       .remove         = apci3200_pci_remove,
 };
 module_comedi_pci_driver(apci3200_driver, apci3200_pci_driver);
index 4c60167be2fcae6dd4004406515f748137763b79..530d352e4b6a75283115c21902f52e0b7cc54bd3 100644 (file)
@@ -66,7 +66,7 @@ static struct pci_driver apci3501_pci_driver = {
        .name           = "addi_apci_3501",
        .id_table       = apci3501_pci_table,
        .probe          = apci3501_pci_probe,
-       .remove         = __devexit_p(apci3501_pci_remove),
+       .remove         = apci3501_pci_remove,
 };
 module_comedi_pci_driver(apci3501_driver, apci3501_pci_driver);
 
index cc3938124cdc810ea5bd2a06dfdb842d2593ec39..4a3e346c359fcf178bb82e70ca1ac4fd2afdee4c 100644 (file)
@@ -790,7 +790,7 @@ static struct pci_driver apci3xxx_pci_driver = {
        .name           = "addi_apci_3xxx",
        .id_table       = apci3xxx_pci_table,
        .probe          = apci3xxx_pci_probe,
-       .remove         = __devexit_p(apci3xxx_pci_remove),
+       .remove         = apci3xxx_pci_remove,
 };
 module_comedi_pci_driver(apci3xxx_driver, apci3xxx_pci_driver);
 
index 73fd9750327eec97018ba5c7f1df32c0fb85d91e..67d7ba1e36b6a48cc0ec6a51e856a71cc5378461 100644 (file)
@@ -286,7 +286,7 @@ static struct pci_driver adl_pci6208_pci_driver = {
        .name           = "adl_pci6208",
        .id_table       = adl_pci6208_pci_table,
        .probe          = adl_pci6208_pci_probe,
-       .remove         = __devexit_p(adl_pci6208_pci_remove),
+       .remove         = adl_pci6208_pci_remove,
 };
 module_comedi_pci_driver(adl_pci6208_driver, adl_pci6208_pci_driver);
 
index be01b2021979e165e5347f50fddf17aa9d264923..9ac356b6201d13a62d5b789d83ac67bbf3e9951c 100644 (file)
@@ -322,7 +322,7 @@ static struct pci_driver adl_pci7x3x_pci_driver = {
        .name           = "adl_pci7x3x",
        .id_table       = adl_pci7x3x_pci_table,
        .probe          = adl_pci7x3x_pci_probe,
-       .remove         = __devexit_p(adl_pci7x3x_pci_remove),
+       .remove         = adl_pci7x3x_pci_remove,
 };
 module_comedi_pci_driver(adl_pci7x3x_driver, adl_pci7x3x_pci_driver);
 
index 41993ec436f6837030fd345b2c3e0068eca0593f..d5eb68b4f00f594583d69e57be9153e1627ee1c7 100644 (file)
@@ -313,7 +313,7 @@ static struct pci_driver adl_pci8164_pci_driver = {
        .name           = "adl_pci8164",
        .id_table       = adl_pci8164_pci_table,
        .probe          = adl_pci8164_pci_probe,
-       .remove         = __devexit_p(adl_pci8164_pci_remove),
+       .remove         = adl_pci8164_pci_remove,
 };
 module_comedi_pci_driver(adl_pci8164_driver, adl_pci8164_pci_driver);
 
index 570ccc676ccc52686b0242792b5c44dc60381c67..1fac2f71b2a861b518088ee32a07c6a0993f7ae7 100644 (file)
@@ -979,7 +979,7 @@ static struct pci_driver adl_pci9111_pci_driver = {
        .name           = "adl_pci9111",
        .id_table       = pci9111_pci_table,
        .probe          = pci9111_pci_probe,
-       .remove         = __devexit_p(pci9111_pci_remove),
+       .remove         = pci9111_pci_remove,
 };
 module_comedi_pci_driver(adl_pci9111_driver, adl_pci9111_pci_driver);
 
index a6b21cb61da6ae0fd9b4156d97c39fcb7f0c128e..c7d0f33e143a4f3e71b0f5856c08e344b44ad7d9 100644 (file)
@@ -2240,7 +2240,7 @@ static struct pci_driver adl_pci9118_pci_driver = {
        .name           = "adl_pci9118",
        .id_table       = adl_pci9118_pci_table,
        .probe          = adl_pci9118_pci_probe,
-       .remove         = __devexit_p(adl_pci9118_pci_remove),
+       .remove         = adl_pci9118_pci_remove,
 };
 module_comedi_pci_driver(adl_pci9118_driver, adl_pci9118_pci_driver);
 
index bdfa9051f4f0906cc3901dbbbe17933f2cd39f33..59c1d843a08e440a33717af84ec6f3511910b0b9 100644 (file)
@@ -1421,7 +1421,7 @@ static struct pci_driver adv_pci1710_pci_driver = {
        .name           = "adv_pci1710",
        .id_table       = adv_pci1710_pci_table,
        .probe          = adv_pci1710_pci_probe,
-       .remove         = __devexit_p(adv_pci1710_pci_remove),
+       .remove         = adv_pci1710_pci_remove,
 };
 module_comedi_pci_driver(adv_pci1710_driver, adv_pci1710_pci_driver);
 
index 490e4347f11e08a6e6d6d65ead0f690ada15ab10..70e017bfa06cb867ea7ff2a553626001e08ef07d 100644 (file)
@@ -342,7 +342,7 @@ static struct pci_driver adv_pci1723_pci_driver = {
        .name           = "adv_pci1723",
        .id_table       = adv_pci1723_pci_table,
        .probe          = adv_pci1723_pci_probe,
-       .remove         = __devexit_p(adv_pci1723_pci_remove),
+       .remove         = adv_pci1723_pci_remove,
 };
 module_comedi_pci_driver(adv_pci1723_driver, adv_pci1723_pci_driver);
 
index bb69c0d71ce5679ee4e704ee23b1cb8d0cd3b8d9..9e75006c9e741003b269d9c62761e409846632e8 100644 (file)
@@ -1234,7 +1234,7 @@ static struct pci_driver adv_pci_dio_pci_driver = {
        .name           = "adv_pci_dio",
        .id_table       = adv_pci_dio_pci_table,
        .probe          = adv_pci_dio_pci_probe,
-       .remove         = __devexit_p(adv_pci_dio_pci_remove),
+       .remove         = adv_pci_dio_pci_remove,
 };
 module_comedi_pci_driver(adv_pci_dio_driver, adv_pci_dio_pci_driver);
 
index 57c618b4e989ce64d290b0a2497163a5cf902446..909acf89f4ff6844a0a5fd0266f4d0d0b48713cb 100644 (file)
@@ -2088,7 +2088,7 @@ static struct pci_driver amplc_dio200_pci_driver = {
        .name = DIO200_DRIVER_NAME,
        .id_table = dio200_pci_table,
        .probe = &amplc_dio200_pci_probe,
-       .remove = __devexit_p(&amplc_dio200_pci_remove)
+       .remove = &amplc_dio200_pci_remove
 };
 module_comedi_pci_driver(amplc_dio200_driver, amplc_dio200_pci_driver);
 #else
index d460b243f37bf279acdc07401d389f1e0ea78373..09e096c6b6bdc2c0d72f5d38ebb65e8837fd98fc 100644 (file)
@@ -623,7 +623,7 @@ static struct pci_driver amplc_pc236_pci_driver = {
        .name = PC236_DRIVER_NAME,
        .id_table = pc236_pci_table,
        .probe = &amplc_pc236_pci_probe,
-       .remove = __devexit_p(&amplc_pc236_pci_remove)
+       .remove = &amplc_pc236_pci_remove
 };
 
 module_comedi_pci_driver(amplc_pc236_driver, amplc_pc236_pci_driver);
index dc9504914e2b699c85261f4f209593daae7287f0..c041716efb05c2b80d86b5badcac44903c0ce690 100644 (file)
@@ -381,7 +381,7 @@ static struct pci_driver amplc_pc263_pci_driver = {
        .name = PC263_DRIVER_NAME,
        .id_table = pc263_pci_table,
        .probe = &amplc_pc263_pci_probe,
-       .remove = __devexit_p(&amplc_pc263_pci_remove)
+       .remove = &amplc_pc263_pci_remove
 };
 module_comedi_pci_driver(amplc_pc263_driver, amplc_pc263_pci_driver);
 #else
index 0b901d5d2694480992e54febdf5dca733e51dbbc..1713a6660757bb8429a06a2c1294874d01f5c9f7 100644 (file)
@@ -1528,7 +1528,7 @@ static struct pci_driver amplc_pci224_pci_driver = {
        .name           = "amplc_pci224",
        .id_table       = amplc_pci224_pci_table,
        .probe          = amplc_pci224_pci_probe,
-       .remove         = __devexit_p(amplc_pci224_pci_remove),
+       .remove         = amplc_pci224_pci_remove,
 };
 module_comedi_pci_driver(amplc_pci224_driver, amplc_pci224_pci_driver);
 
index 7cc48ec1d5f827371c9a38ef00cffd65231d0f34..d0ea06992520058f605f102b16b9674a6ee81108 100644 (file)
@@ -2879,7 +2879,7 @@ static struct pci_driver amplc_pci230_pci_driver = {
        .name           = "amplc_pci230",
        .id_table       = amplc_pci230_pci_table,
        .probe          = amplc_pci230_pci_probe,
-       .remove         = __devexit_p(amplc_pci230_pci_remove)
+       .remove         = amplc_pci230_pci_remove
 };
 module_comedi_pci_driver(amplc_pci230_driver, amplc_pci230_pci_driver);
 
index 9c45e85ec3046657d04bf55686e1ddf6b75024c1..857a8d63c9fd916dd690570612591182c91c41ad 100644 (file)
@@ -1654,7 +1654,7 @@ static struct pci_driver cb_pcidas_pci_driver = {
        .name           = "cb_pcidas",
        .id_table       = cb_pcidas_pci_table,
        .probe          = cb_pcidas_pci_probe,
-       .remove         = __devexit_p(cb_pcidas_pci_remove)
+       .remove         = cb_pcidas_pci_remove
 };
 module_comedi_pci_driver(cb_pcidas_driver, cb_pcidas_pci_driver);
 
index 17813aa6bb2ec6f4805c9a0a43057eca26c095be..ea2e1e7806660cc021acafc21fd25602d18aeda8 100644 (file)
@@ -4253,7 +4253,7 @@ static struct pci_driver cb_pcidas64_pci_driver = {
        .name           = "cb_pcidas64",
        .id_table       = cb_pcidas64_pci_table,
        .probe          = cb_pcidas64_pci_probe,
-       .remove         = __devexit_p(cb_pcidas64_pci_remove),
+       .remove         = cb_pcidas64_pci_remove,
 };
 module_comedi_pci_driver(cb_pcidas64_driver, cb_pcidas64_pci_driver);
 
index 083bd8636ef9f855d050c833fe0b1140bbb241d1..f1a603b002328e5fc6c7d0e5f3cdc98a9954f434 100644 (file)
@@ -458,7 +458,7 @@ static struct pci_driver cb_pcidda_pci_driver = {
        .name           = "cb_pcidda",
        .id_table       = cb_pcidda_pci_table,
        .probe          = cb_pcidda_pci_probe,
-       .remove         = __devexit_p(cb_pcidda_pci_remove),
+       .remove         = cb_pcidda_pci_remove,
 };
 module_comedi_pci_driver(cb_pcidda_driver, cb_pcidda_pci_driver);
 
index f75873740bc3cbf455d1ea8ca250437781dc2b0a..f171cf9ffd1790f96a0e33efc58276ea0f54f677 100644 (file)
@@ -314,7 +314,7 @@ static struct pci_driver cb_pcimdas_pci_driver = {
        .name           = "cb_pcimdas",
        .id_table       = cb_pcimdas_pci_table,
        .probe          = cb_pcimdas_pci_probe,
-       .remove         = __devexit_p(cb_pcimdas_pci_remove),
+       .remove         = cb_pcimdas_pci_remove,
 };
 module_comedi_pci_driver(cb_pcimdas_driver, cb_pcimdas_pci_driver);
 
index 89c70385330e9674d2c3d60c9077ba5f121db8c6..78e2ba3f1f24080a75ddc4ff6868be7442c7e366 100644 (file)
@@ -237,7 +237,7 @@ static struct pci_driver cb_pcimdda_driver_pci_driver = {
        .name           = "cb_pcimdda",
        .id_table       = cb_pcimdda_pci_table,
        .probe          = cb_pcimdda_pci_probe,
-       .remove         = __devexit_p(cb_pcimdda_pci_remove),
+       .remove         = cb_pcimdda_pci_remove,
 };
 module_comedi_pci_driver(cb_pcimdda_driver, cb_pcimdda_driver_pci_driver);
 
index c06b7b682f7d4aacef4a70a2cdee562b366826eb..3c0ca852d017985a0b8979ac0d91903575574cb6 100644 (file)
@@ -145,7 +145,7 @@ static struct pci_driver contec_pci_dio_pci_driver = {
        .name           = "contec_pci_dio",
        .id_table       = contec_pci_dio_pci_table,
        .probe          = contec_pci_dio_pci_probe,
-       .remove         = __devexit_p(contec_pci_dio_pci_remove),
+       .remove         = contec_pci_dio_pci_remove,
 };
 module_comedi_pci_driver(contec_pci_dio_driver, contec_pci_dio_pci_driver);
 
index c5aa6b8d8f7b9f62dbe41f2b70969abc529c138e..c0fd3b15815533d7e3b3daaf81ee3a620e35317c 100644 (file)
@@ -814,7 +814,7 @@ static struct pci_driver daqboard2000_pci_driver = {
        .name           = "daqboard2000",
        .id_table       = daqboard2000_pci_table,
        .probe          = daqboard2000_pci_probe,
-       .remove         = __devexit_p(daqboard2000_pci_remove),
+       .remove         = daqboard2000_pci_remove,
 };
 module_comedi_pci_driver(daqboard2000_driver, daqboard2000_pci_driver);
 
index cc654542a6d26e7a18d258d15d337fd886ed72b9..88f78a0efb2a0770f9f7ce8bbca8bbd4d8157579 100644 (file)
@@ -900,7 +900,7 @@ static struct pci_driver das08_pci_driver = {
        .id_table = das08_pci_table,
        .name =  DRV_NAME,
        .probe = &das08_pci_probe,
-       .remove = __devexit_p(&das08_pci_remove)
+       .remove = &das08_pci_remove
 };
 #endif /* DO_PCI */
 
index f6d4ebd6cb5938e70ffdb9a5335670e7d43a4d4a..b61004b422a62fffe117db29a6f234865bd09de1 100644 (file)
@@ -877,7 +877,7 @@ static struct pci_driver dt3000_pci_driver = {
        .name           = "dt3000",
        .id_table       = dt3000_pci_table,
        .probe          = dt3000_pci_probe,
-       .remove         = __devexit_p(dt3000_pci_remove),
+       .remove         = dt3000_pci_remove,
 };
 module_comedi_pci_driver(dt3000_driver, dt3000_pci_driver);
 
index 363b09d217ea96cebc4ebe74ea8d873bf64a03ef..8736ef97f3be70ff981133c759b2453ed7e0100b 100644 (file)
@@ -291,7 +291,7 @@ static struct pci_driver dyna_pci10xx_pci_driver = {
        .name           = "dyna_pci10xx",
        .id_table       = dyna_pci10xx_pci_table,
        .probe          = dyna_pci10xx_pci_probe,
-       .remove         = __devexit_p(dyna_pci10xx_pci_remove),
+       .remove         = dyna_pci10xx_pci_remove,
 };
 module_comedi_pci_driver(dyna_pci10xx_driver, dyna_pci10xx_pci_driver);
 
index eb3cb80ff2a5f26a197378cab1757d12b485d284..98926469e693e0b1cb05ec35c4d6b3be23e72abf 100644 (file)
@@ -962,7 +962,7 @@ static struct pci_driver gsc_hpdi_pci_driver = {
        .name           = "gsc_hpdi",
        .id_table       = gsc_hpdi_pci_table,
        .probe          = gsc_hpdi_pci_probe,
-       .remove         = __devexit_p(gsc_hpdi_pci_remove)
+       .remove         = gsc_hpdi_pci_remove
 };
 module_comedi_pci_driver(gsc_hpdi_driver, gsc_hpdi_pci_driver);
 
index e7bb6031e54bdf761608d89c9ffd376595a818d3..ee9b40825883bcb0016b7a6d0208f0a5aab0a93c 100644 (file)
@@ -638,7 +638,7 @@ static struct pci_driver icp_multi_pci_driver = {
        .name           = "icp_multi",
        .id_table       = icp_multi_pci_table,
        .probe          = icp_multi_pci_probe,
-       .remove         = __devexit_p(icp_multi_pci_remove),
+       .remove         = icp_multi_pci_remove,
 };
 module_comedi_pci_driver(icp_multi_driver, icp_multi_pci_driver);
 
index 65d65fe23d6e7f666c521ac7209dde2e2dfcd1e3..ad24b7310ea106b4fb8d97ebc37facf3f59df21b 100644 (file)
@@ -863,7 +863,7 @@ static struct pci_driver jr3_pci_pci_driver = {
        .name           = "jr3_pci",
        .id_table       = jr3_pci_pci_table,
        .probe          = jr3_pci_pci_probe,
-       .remove         = __devexit_p(jr3_pci_pci_remove),
+       .remove         = jr3_pci_pci_remove,
 };
 module_comedi_pci_driver(jr3_pci_driver, jr3_pci_pci_driver);
 
index a59a12b4f19302fcb196d225f2fe7919a370e278..63c3a1af7e51dfad064f39910296236ca6133f14 100644 (file)
@@ -167,7 +167,7 @@ static struct pci_driver ke_counter_pci_driver = {
        .name           = "ke_counter",
        .id_table       = ke_counter_pci_table,
        .probe          = ke_counter_pci_probe,
-       .remove         = __devexit_p(ke_counter_pci_remove),
+       .remove         = ke_counter_pci_remove,
 };
 module_comedi_pci_driver(ke_counter_driver, ke_counter_pci_driver);
 
index a489a6548e75983161cd6bc6121dacc07a5c83a1..07594c579b1808c956433900e9bcf268da64a74a 100644 (file)
@@ -1761,7 +1761,7 @@ static struct pci_driver me4000_pci_driver = {
        .name           = "me4000",
        .id_table       = me4000_pci_table,
        .probe          = me4000_pci_probe,
-       .remove         = __devexit_p(me4000_pci_remove),
+       .remove         = me4000_pci_remove,
 };
 module_comedi_pci_driver(me4000_driver, me4000_pci_driver);
 
index 22cf0f1e5471b142b481ec615165eaca456cde5a..b6482dd2a8231214ec51e1c1c8c3ba00ca608fc9 100644 (file)
@@ -635,7 +635,7 @@ static struct pci_driver me_daq_pci_driver = {
        .name           = "me_daq",
        .id_table       = me_daq_pci_table,
        .probe          = me_daq_pci_probe,
-       .remove         = __devexit_p(me_daq_pci_remove),
+       .remove         = me_daq_pci_remove,
 };
 module_comedi_pci_driver(me_daq_driver, me_daq_pci_driver);
 
index 24102d1aa82e10e29989e8d749cad36a6d0f169d..7ecebb75fe553716e6d414564d4d05a596f5f700 100644 (file)
@@ -461,7 +461,7 @@ static struct pci_driver ni6527_pci_driver = {
        .name = DRIVER_NAME,
        .id_table = ni6527_pci_table,
        .probe = ni6527_pci_probe,
-       .remove = __devexit_p(ni6527_pci_remove)
+       .remove = ni6527_pci_remove
 };
 module_comedi_pci_driver(ni6527_driver, ni6527_pci_driver);
 
index 8318081c89bedf9ef18bd5f96db750ac0b41b5b7..d2204c2cebe845f24d67ae5a835c0d85155f2555 100644 (file)
@@ -797,7 +797,7 @@ static struct pci_driver ni_65xx_pci_driver = {
        .name = "ni_65xx",
        .id_table = ni_65xx_pci_table,
        .probe = ni_65xx_pci_probe,
-       .remove = __devexit_p(ni_65xx_pci_remove)
+       .remove = ni_65xx_pci_remove
 };
 module_comedi_pci_driver(ni_65xx_driver, ni_65xx_pci_driver);
 
index d1561c72e2d3d81ecbf0b26309e8625e9c218101..aaf4fe771eec787075050ccd4da370a29cf2814d 100644 (file)
@@ -1345,7 +1345,7 @@ static struct pci_driver ni_660x_pci_driver = {
        .name           = "ni_660x",
        .id_table       = ni_660x_pci_table,
        .probe          = ni_660x_pci_probe,
-       .remove         = __devexit_p(ni_660x_pci_remove),
+       .remove         = ni_660x_pci_remove,
 };
 module_comedi_pci_driver(ni_660x_driver, ni_660x_pci_driver);
 
index 7a72131b9358d387fdadeceffdca5d1456accd77..5080eca0b9ef83175d5cd2a6ec360903274cbb5f 100644 (file)
@@ -325,7 +325,7 @@ static struct pci_driver ni_670x_pci_driver = {
        .name           = "ni_670x",
        .id_table       = ni_670x_pci_table,
        .probe          = ni_670x_pci_probe,
-       .remove         = __devexit_p(ni_670x_pci_remove),
+       .remove         = ni_670x_pci_remove,
 };
 module_comedi_pci_driver(ni_670x_driver, ni_670x_pci_driver);
 
index b56039bea6a83109b3113c509791bce8bbb2d7a3..b2e565bf3df0a2d71a61087b1189ccc33f76a642 100644 (file)
@@ -2125,7 +2125,7 @@ static struct pci_driver labpc_pci_driver = {
        .name = DRV_NAME,
        .id_table = labpc_pci_table,
        .probe = labpc_pci_probe,
-       .remove = __devexit_p(labpc_pci_remove)
+       .remove = labpc_pci_remove
 };
 module_comedi_pci_driver(labpc_driver, labpc_pci_driver);
 #else
index 5d442b09c672736dd6ede84e64a4383b31ff0045..f4dd5df0d7e1f35eaefd2a863a164140e6ecf253 100644 (file)
@@ -1241,7 +1241,7 @@ static struct pci_driver ni_pcidio_pci_driver = {
        .name           = "ni_pcidio",
        .id_table       = ni_pcidio_pci_table,
        .probe          = ni_pcidio_pci_probe,
-       .remove         = __devexit_p(ni_pcidio_pci_remove),
+       .remove         = ni_pcidio_pci_remove,
 };
 module_comedi_pci_driver(ni_pcidio_driver, ni_pcidio_pci_driver);
 
index 65e1896c077f4684c0e7627db47c0faec764476c..597a2d3c4a6caddadeaf801d8b45a8641aa57e33 100644 (file)
@@ -1858,7 +1858,7 @@ static struct pci_driver ni_pcimio_pci_driver = {
        .name           = "ni_pcimio",
        .id_table       = ni_pcimio_pci_table,
        .probe          = ni_pcimio_pci_probe,
-       .remove         = __devexit_p(ni_pcimio_pci_remove)
+       .remove         = ni_pcimio_pci_remove
 };
 module_comedi_pci_driver(ni_pcimio_driver, ni_pcimio_pci_driver);
 
index 5b31e60ffb54541426c25b5cd26632de180a8efe..83edc3e85e8271ad83caf86c6e9df076f418670d 100644 (file)
@@ -1436,7 +1436,7 @@ static struct pci_driver rtd520_pci_driver = {
        .name           = "rtd520",
        .id_table       = rtd520_pci_table,
        .probe          = rtd520_pci_probe,
-       .remove         = __devexit_p(rtd520_pci_remove),
+       .remove         = rtd520_pci_remove,
 };
 module_comedi_pci_driver(rtd520_driver, rtd520_pci_driver);
 
index e32b54f4bfc2da61a993949805c7a9d0e4c505fe..30686e2b8a713001627c54bee7802247ad68cc40 100644 (file)
@@ -2857,7 +2857,7 @@ static struct pci_driver s626_pci_driver = {
        .name           = "s626",
        .id_table       = s626_pci_table,
        .probe          = s626_pci_probe,
-       .remove         = __devexit_p(s626_pci_remove),
+       .remove         = s626_pci_remove,
 };
 module_comedi_pci_driver(s626_driver, s626_pci_driver);
 
index deb0bfaf0a3bc34b4892d425e057a755b7a476fc..98c1868ab03d7bd0e7b1f3f656a875718e6a39b0 100644 (file)
@@ -719,7 +719,7 @@ static void __devexit skel_pci_remove(struct pci_dev *dev)
 static struct pci_driver skel_pci_driver = {
        .id_table = skel_pci_table,
        .probe = &skel_pci_probe,
-       .remove = __devexit_p(&skel_pci_remove)
+       .remove = &skel_pci_remove
 };
 module_comedi_pci_driver(skel_driver, skel_pci_driver);
 #else