Bladeren bron

staging: comedi: remove use of __devexit

CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bill Pemberton 12 jaren geleden
bovenliggende
commit
53b8001985
53 gewijzigde bestanden met toevoegingen van 53 en 53 verwijderingen
  1. 1 1
      drivers/staging/comedi/drivers/8255_pci.c
  2. 1 1
      drivers/staging/comedi/drivers/addi_apci_035.c
  3. 1 1
      drivers/staging/comedi/drivers/addi_apci_1032.c
  4. 1 1
      drivers/staging/comedi/drivers/addi_apci_1500.c
  5. 1 1
      drivers/staging/comedi/drivers/addi_apci_1516.c
  6. 1 1
      drivers/staging/comedi/drivers/addi_apci_1564.c
  7. 1 1
      drivers/staging/comedi/drivers/addi_apci_16xx.c
  8. 1 1
      drivers/staging/comedi/drivers/addi_apci_1710.c
  9. 1 1
      drivers/staging/comedi/drivers/addi_apci_2032.c
  10. 1 1
      drivers/staging/comedi/drivers/addi_apci_2200.c
  11. 1 1
      drivers/staging/comedi/drivers/addi_apci_3120.c
  12. 1 1
      drivers/staging/comedi/drivers/addi_apci_3200.c
  13. 1 1
      drivers/staging/comedi/drivers/addi_apci_3501.c
  14. 1 1
      drivers/staging/comedi/drivers/addi_apci_3xxx.c
  15. 1 1
      drivers/staging/comedi/drivers/adl_pci6208.c
  16. 1 1
      drivers/staging/comedi/drivers/adl_pci7x3x.c
  17. 1 1
      drivers/staging/comedi/drivers/adl_pci8164.c
  18. 1 1
      drivers/staging/comedi/drivers/adl_pci9111.c
  19. 1 1
      drivers/staging/comedi/drivers/adl_pci9118.c
  20. 1 1
      drivers/staging/comedi/drivers/adv_pci1710.c
  21. 1 1
      drivers/staging/comedi/drivers/adv_pci1723.c
  22. 1 1
      drivers/staging/comedi/drivers/adv_pci_dio.c
  23. 1 1
      drivers/staging/comedi/drivers/amplc_dio200.c
  24. 1 1
      drivers/staging/comedi/drivers/amplc_pc236.c
  25. 1 1
      drivers/staging/comedi/drivers/amplc_pc263.c
  26. 1 1
      drivers/staging/comedi/drivers/amplc_pci224.c
  27. 1 1
      drivers/staging/comedi/drivers/amplc_pci230.c
  28. 1 1
      drivers/staging/comedi/drivers/cb_pcidas.c
  29. 1 1
      drivers/staging/comedi/drivers/cb_pcidas64.c
  30. 1 1
      drivers/staging/comedi/drivers/cb_pcidda.c
  31. 1 1
      drivers/staging/comedi/drivers/cb_pcimdas.c
  32. 1 1
      drivers/staging/comedi/drivers/cb_pcimdda.c
  33. 1 1
      drivers/staging/comedi/drivers/contec_pci_dio.c
  34. 1 1
      drivers/staging/comedi/drivers/daqboard2000.c
  35. 1 1
      drivers/staging/comedi/drivers/das08.c
  36. 1 1
      drivers/staging/comedi/drivers/dt3000.c
  37. 1 1
      drivers/staging/comedi/drivers/dyna_pci10xx.c
  38. 1 1
      drivers/staging/comedi/drivers/gsc_hpdi.c
  39. 1 1
      drivers/staging/comedi/drivers/icp_multi.c
  40. 1 1
      drivers/staging/comedi/drivers/jr3_pci.c
  41. 1 1
      drivers/staging/comedi/drivers/ke_counter.c
  42. 1 1
      drivers/staging/comedi/drivers/me4000.c
  43. 1 1
      drivers/staging/comedi/drivers/me_daq.c
  44. 1 1
      drivers/staging/comedi/drivers/ni_6527.c
  45. 1 1
      drivers/staging/comedi/drivers/ni_65xx.c
  46. 1 1
      drivers/staging/comedi/drivers/ni_660x.c
  47. 1 1
      drivers/staging/comedi/drivers/ni_670x.c
  48. 1 1
      drivers/staging/comedi/drivers/ni_labpc.c
  49. 1 1
      drivers/staging/comedi/drivers/ni_pcidio.c
  50. 1 1
      drivers/staging/comedi/drivers/ni_pcimio.c
  51. 1 1
      drivers/staging/comedi/drivers/rtd520.c
  52. 1 1
      drivers/staging/comedi/drivers/s626.c
  53. 1 1
      drivers/staging/comedi/drivers/skel.c

+ 1 - 1
drivers/staging/comedi/drivers/8255_pci.c

@@ -314,7 +314,7 @@ static int pci_8255_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &pci_8255_driver);
 }
 
-static void __devexit pci_8255_pci_remove(struct pci_dev *dev)
+static void pci_8255_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_035.c

@@ -53,7 +53,7 @@ static int apci035_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci035_driver);
 }
 
-static void __devexit apci035_pci_remove(struct pci_dev *dev)
+static void apci035_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_1032.c

@@ -375,7 +375,7 @@ static int apci1032_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci1032_driver);
 }
 
-static void __devexit apci1032_pci_remove(struct pci_dev *dev)
+static void apci1032_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_1500.c

@@ -53,7 +53,7 @@ static int apci1500_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci1500_driver);
 }
 
-static void __devexit apci1500_pci_remove(struct pci_dev *dev)
+static void apci1500_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_1516.c

@@ -323,7 +323,7 @@ static int apci1516_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci1516_driver);
 }
 
-static void __devexit apci1516_pci_remove(struct pci_dev *dev)
+static void apci1516_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_1564.c

@@ -50,7 +50,7 @@ static int apci1564_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci1564_driver);
 }
 
-static void __devexit apci1564_pci_remove(struct pci_dev *dev)
+static void apci1564_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_16xx.c

@@ -52,7 +52,7 @@ static int apci16xx_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci16xx_driver);
 }
 
-static void __devexit apci16xx_pci_remove(struct pci_dev *dev)
+static void apci16xx_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_1710.c

@@ -128,7 +128,7 @@ static int apci1710_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci1710_driver);
 }
 
-static void __devexit apci1710_pci_remove(struct pci_dev *dev)
+static void apci1710_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_2032.c

@@ -47,7 +47,7 @@ static int apci2032_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci2032_driver);
 }
 
-static void __devexit apci2032_pci_remove(struct pci_dev *dev)
+static void apci2032_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_2200.c

@@ -45,7 +45,7 @@ static int apci2200_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci2200_driver);
 }
 
-static void __devexit apci2200_pci_remove(struct pci_dev *dev)
+static void apci2200_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_3120.c

@@ -251,7 +251,7 @@ static int apci3120_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci3120_driver);
 }
 
-static void __devexit apci3120_pci_remove(struct pci_dev *dev)
+static void apci3120_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_3200.c

@@ -106,7 +106,7 @@ static int apci3200_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci3200_driver);
 }
 
-static void __devexit apci3200_pci_remove(struct pci_dev *dev)
+static void apci3200_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_3501.c

@@ -57,7 +57,7 @@ static int apci3501_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci3501_driver);
 }
 
-static void __devexit apci3501_pci_remove(struct pci_dev *dev)
+static void apci3501_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/addi_apci_3xxx.c

@@ -751,7 +751,7 @@ static int apci3xxx_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &apci3xxx_driver);
 }
 
-static void __devexit apci3xxx_pci_remove(struct pci_dev *dev)
+static void apci3xxx_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/adl_pci6208.c

@@ -270,7 +270,7 @@ static int adl_pci6208_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &adl_pci6208_driver);
 }
 
-static void __devexit adl_pci6208_pci_remove(struct pci_dev *dev)
+static void adl_pci6208_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/adl_pci7x3x.c

@@ -302,7 +302,7 @@ static int adl_pci7x3x_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &adl_pci7x3x_driver);
 }
 
-static void __devexit adl_pci7x3x_pci_remove(struct pci_dev *dev)
+static void adl_pci7x3x_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/adl_pci8164.c

@@ -298,7 +298,7 @@ static int adl_pci8164_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &adl_pci8164_driver);
 }
 
-static void __devexit adl_pci8164_pci_remove(struct pci_dev *dev)
+static void adl_pci8164_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/adl_pci9111.c

@@ -963,7 +963,7 @@ static int pci9111_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &adl_pci9111_driver);
 }
 
-static void __devexit pci9111_pci_remove(struct pci_dev *dev)
+static void pci9111_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/adl_pci9118.c

@@ -2225,7 +2225,7 @@ static int adl_pci9118_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &adl_pci9118_driver);
 }
 
-static void __devexit adl_pci9118_pci_remove(struct pci_dev *dev)
+static void adl_pci9118_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/adv_pci1710.c

@@ -1402,7 +1402,7 @@ static int adv_pci1710_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &adv_pci1710_driver);
 }
 
-static void __devexit adv_pci1710_pci_remove(struct pci_dev *dev)
+static void adv_pci1710_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/adv_pci1723.c

@@ -327,7 +327,7 @@ static int adv_pci1723_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &adv_pci1723_driver);
 }
 
-static void __devexit adv_pci1723_pci_remove(struct pci_dev *dev)
+static void adv_pci1723_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/adv_pci_dio.c

@@ -1206,7 +1206,7 @@ static int adv_pci_dio_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &adv_pci_dio_driver);
 }
 
-static void __devexit adv_pci_dio_pci_remove(struct pci_dev *dev)
+static void adv_pci_dio_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/amplc_dio200.c

@@ -2079,7 +2079,7 @@ static int amplc_dio200_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &amplc_dio200_driver);
 }
 
-static void __devexit amplc_dio200_pci_remove(struct pci_dev *dev)
+static void amplc_dio200_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/amplc_pc236.c

@@ -614,7 +614,7 @@ static int amplc_pc236_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &amplc_pc236_driver);
 }
 
-static void __devexit amplc_pc236_pci_remove(struct pci_dev *dev)
+static void amplc_pc236_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/amplc_pc263.c

@@ -372,7 +372,7 @@ static int amplc_pc263_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &amplc_pc263_driver);
 }
 
-static void __devexit amplc_pc263_pci_remove(struct pci_dev *dev)
+static void amplc_pc263_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/amplc_pci224.c

@@ -1512,7 +1512,7 @@ static int amplc_pci224_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &amplc_pci224_driver);
 }
 
-static void __devexit amplc_pci224_pci_remove(struct pci_dev *dev)
+static void amplc_pci224_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/amplc_pci230.c

@@ -2863,7 +2863,7 @@ static int amplc_pci230_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &amplc_pci230_driver);
 }
 
-static void __devexit amplc_pci230_pci_remove(struct pci_dev *dev)
+static void amplc_pci230_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/cb_pcidas.c

@@ -1632,7 +1632,7 @@ static int cb_pcidas_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &cb_pcidas_driver);
 }
 
-static void __devexit cb_pcidas_pci_remove(struct pci_dev *dev)
+static void cb_pcidas_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/cb_pcidas64.c

@@ -4220,7 +4220,7 @@ static int cb_pcidas64_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &cb_pcidas64_driver);
 }
 
-static void __devexit cb_pcidas64_pci_remove(struct pci_dev *dev)
+static void cb_pcidas64_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/cb_pcidda.c

@@ -438,7 +438,7 @@ static int cb_pcidda_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &cb_pcidda_driver);
 }
 
-static void __devexit cb_pcidda_pci_remove(struct pci_dev *dev)
+static void cb_pcidda_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/cb_pcimdas.c

@@ -299,7 +299,7 @@ static int cb_pcimdas_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &cb_pcimdas_driver);
 }
 
-static void __devexit cb_pcimdas_pci_remove(struct pci_dev *dev)
+static void cb_pcimdas_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/cb_pcimdda.c

@@ -222,7 +222,7 @@ static int cb_pcimdda_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &cb_pcimdda_driver);
 }
 
-static void __devexit cb_pcimdda_pci_remove(struct pci_dev *dev)
+static void cb_pcimdda_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/contec_pci_dio.c

@@ -130,7 +130,7 @@ static int contec_pci_dio_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &contec_pci_dio_driver);
 }
 
-static void __devexit contec_pci_dio_pci_remove(struct pci_dev *dev)
+static void contec_pci_dio_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/daqboard2000.c

@@ -799,7 +799,7 @@ static int daqboard2000_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &daqboard2000_driver);
 }
 
-static void __devexit daqboard2000_pci_remove(struct pci_dev *dev)
+static void daqboard2000_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/das08.c

@@ -891,7 +891,7 @@ static int das08_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &das08_driver);
 }
 
-static void __devexit das08_pci_remove(struct pci_dev *dev)
+static void das08_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/dt3000.c

@@ -856,7 +856,7 @@ static int dt3000_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &dt3000_driver);
 }
 
-static void __devexit dt3000_pci_remove(struct pci_dev *dev)
+static void dt3000_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/dyna_pci10xx.c

@@ -276,7 +276,7 @@ static int dyna_pci10xx_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &dyna_pci10xx_driver);
 }
 
-static void __devexit dyna_pci10xx_pci_remove(struct pci_dev *dev)
+static void dyna_pci10xx_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/gsc_hpdi.c

@@ -946,7 +946,7 @@ static int gsc_hpdi_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &gsc_hpdi_driver);
 }
 
-static void __devexit gsc_hpdi_pci_remove(struct pci_dev *dev)
+static void gsc_hpdi_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/icp_multi.c

@@ -623,7 +623,7 @@ static int icp_multi_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &icp_multi_driver);
 }
 
-static void __devexit icp_multi_pci_remove(struct pci_dev *dev)
+static void icp_multi_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/jr3_pci.c

@@ -844,7 +844,7 @@ static int jr3_pci_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &jr3_pci_driver);
 }
 
-static void __devexit jr3_pci_pci_remove(struct pci_dev *dev)
+static void jr3_pci_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/ke_counter.c

@@ -152,7 +152,7 @@ static int ke_counter_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &ke_counter_driver);
 }
 
-static void __devexit ke_counter_pci_remove(struct pci_dev *dev)
+static void ke_counter_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/me4000.c

@@ -1734,7 +1734,7 @@ static int me4000_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &me4000_driver);
 }
 
-static void __devexit me4000_pci_remove(struct pci_dev *dev)
+static void me4000_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/me_daq.c

@@ -619,7 +619,7 @@ static int me_daq_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &me_daq_driver);
 }
 
-static void __devexit me_daq_pci_remove(struct pci_dev *dev)
+static void me_daq_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/ni_6527.c

@@ -452,7 +452,7 @@ static int ni6527_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &ni6527_driver);
 }
 
-static void __devexit ni6527_pci_remove(struct pci_dev *dev)
+static void ni6527_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/ni_65xx.c

@@ -788,7 +788,7 @@ static int ni_65xx_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &ni_65xx_driver);
 }
 
-static void __devexit ni_65xx_pci_remove(struct pci_dev *dev)
+static void ni_65xx_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/ni_660x.c

@@ -1327,7 +1327,7 @@ static int ni_660x_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &ni_660x_driver);
 }
 
-static void __devexit ni_660x_pci_remove(struct pci_dev *dev)
+static void ni_660x_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/ni_670x.c

@@ -309,7 +309,7 @@ static int ni_670x_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &ni_670x_driver);
 }
 
-static void __devexit ni_670x_pci_remove(struct pci_dev *dev)
+static void ni_670x_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/ni_labpc.c

@@ -2116,7 +2116,7 @@ static int labpc_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &labpc_driver);
 }
 
-static void __devexit labpc_pci_remove(struct pci_dev *dev)
+static void labpc_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/ni_pcidio.c

@@ -1224,7 +1224,7 @@ static int ni_pcidio_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &ni_pcidio_driver);
 }
 
-static void __devexit ni_pcidio_pci_remove(struct pci_dev *dev)
+static void ni_pcidio_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/ni_pcimio.c

@@ -1791,7 +1791,7 @@ static int ni_pcimio_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &ni_pcimio_driver);
 }
 
-static void __devexit ni_pcimio_pci_remove(struct pci_dev *dev)
+static void ni_pcimio_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/rtd520.c

@@ -1420,7 +1420,7 @@ static int rtd520_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &rtd520_driver);
 }
 
-static void __devexit rtd520_pci_remove(struct pci_dev *dev)
+static void rtd520_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/s626.c

@@ -2836,7 +2836,7 @@ static int s626_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &s626_driver);
 }
 
-static void __devexit s626_pci_remove(struct pci_dev *dev)
+static void s626_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }

+ 1 - 1
drivers/staging/comedi/drivers/skel.c

@@ -707,7 +707,7 @@ static int skel_pci_probe(struct pci_dev *dev,
 	return comedi_pci_auto_config(dev, &skel_driver);
 }
 
-static void __devexit skel_pci_remove(struct pci_dev *dev)
+static void skel_pci_remove(struct pci_dev *dev)
 {
 	comedi_pci_auto_unconfig(dev);
 }