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 71ad619..c897d39 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 3055fc2..489d151 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 0f47113..9c2e7f7 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 8528b27..67f145d 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 e6aa522..086445f 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 926fa08..1d51233 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 170d576..07d7c9a 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 485f821..5d26336 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 7758de3..a80bf01 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 3041009..9271cfe 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 34aab50..77a9fe9 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 e95141d..59120cf 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 4c60167..530d352 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 cc39381..4a3e346 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 73fd975..67d7ba1 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 be01b20..9ac356b 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 41993ec..d5eb68b 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 570ccc6..1fac2f7 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 a6b21cb..c7d0f33 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 bdfa905..59c1d84 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 490e434..70e017b 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 bb69c0d..9e75006 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 57c618b..909acf8 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 d460b24..09e096c 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 dc95049..c041716 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 0b901d5..1713a66 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 7cc48ec..d0ea069 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 9c45e85..857a8d6 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 17813aa..ea2e1e7 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 083bd86..f1a603b 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 f758737..f171cf9 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 89c7038..78e2ba3 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 c06b7b6..3c0ca85 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 c5aa6b8..c0fd3b1 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 cc65454..88f78a0 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 f6d4ebd..b61004b 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 363b09d..8736ef9 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 eb3cb80..9892646 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 e7bb603..ee9b408 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 65d65fe..ad24b73 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 a59a12b..63c3a1a 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 a489a65..07594c5 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 22cf0f1..b6482dd 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 24102d1..7ecebb7 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 8318081..d2204c2 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 d1561c7..aaf4fe7 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 7a72131..5080eca 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 b56039b..b2e565b 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 5d442b0..f4dd5df 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 65e1896..597a2d3 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 5b31e60..83edc3e 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 e32b54f..30686e2 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 deb0bfa..98c1868 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