浏览代码

staging: iio: 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>
Cc: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bill Pemberton 12 年之前
父节点
当前提交
447d4f29ee
共有 62 个文件被更改,包括 65 次插入65 次删除
  1. 1 1
      drivers/staging/iio/accel/adis16201_core.c
  2. 1 1
      drivers/staging/iio/accel/adis16203_core.c
  3. 1 1
      drivers/staging/iio/accel/adis16204_core.c
  4. 1 1
      drivers/staging/iio/accel/adis16209_core.c
  5. 1 1
      drivers/staging/iio/accel/adis16220_core.c
  6. 1 1
      drivers/staging/iio/accel/adis16240_core.c
  7. 1 1
      drivers/staging/iio/accel/kxsd9.c
  8. 1 1
      drivers/staging/iio/accel/lis3l02dq_core.c
  9. 1 1
      drivers/staging/iio/accel/sca3000_core.c
  10. 1 1
      drivers/staging/iio/adc/ad7192.c
  11. 1 1
      drivers/staging/iio/adc/ad7280a.c
  12. 1 1
      drivers/staging/iio/adc/ad7291.c
  13. 1 1
      drivers/staging/iio/adc/ad7606_par.c
  14. 1 1
      drivers/staging/iio/adc/ad7606_spi.c
  15. 1 1
      drivers/staging/iio/adc/ad7780.c
  16. 1 1
      drivers/staging/iio/adc/ad7793.c
  17. 1 1
      drivers/staging/iio/adc/ad7816.c
  18. 1 1
      drivers/staging/iio/adc/ad799x_core.c
  19. 3 3
      drivers/staging/iio/adc/adt7410.c
  20. 1 1
      drivers/staging/iio/adc/lpc32xx_adc.c
  21. 1 1
      drivers/staging/iio/adc/mxs-lradc.c
  22. 1 1
      drivers/staging/iio/adc/spear_adc.c
  23. 1 1
      drivers/staging/iio/addac/adt7316-i2c.c
  24. 1 1
      drivers/staging/iio/addac/adt7316-spi.c
  25. 1 1
      drivers/staging/iio/addac/adt7316.c
  26. 1 1
      drivers/staging/iio/cdc/ad7150.c
  27. 1 1
      drivers/staging/iio/cdc/ad7152.c
  28. 1 1
      drivers/staging/iio/cdc/ad7746.c
  29. 1 1
      drivers/staging/iio/frequency/ad5930.c
  30. 1 1
      drivers/staging/iio/frequency/ad9832.c
  31. 1 1
      drivers/staging/iio/frequency/ad9834.c
  32. 1 1
      drivers/staging/iio/frequency/ad9850.c
  33. 1 1
      drivers/staging/iio/frequency/ad9852.c
  34. 1 1
      drivers/staging/iio/frequency/ad9910.c
  35. 1 1
      drivers/staging/iio/frequency/ad9951.c
  36. 2 2
      drivers/staging/iio/gyro/adis16060_core.c
  37. 1 1
      drivers/staging/iio/gyro/adis16080_core.c
  38. 1 1
      drivers/staging/iio/gyro/adis16130_core.c
  39. 1 1
      drivers/staging/iio/gyro/adis16260_core.c
  40. 1 1
      drivers/staging/iio/gyro/adxrs450_core.c
  41. 1 1
      drivers/staging/iio/iio_hwmon.c
  42. 1 1
      drivers/staging/iio/impedance-analyzer/ad5933.c
  43. 1 1
      drivers/staging/iio/imu/adis16400_core.c
  44. 1 1
      drivers/staging/iio/light/isl29018.c
  45. 1 1
      drivers/staging/iio/light/isl29028.c
  46. 1 1
      drivers/staging/iio/light/tsl2563.c
  47. 1 1
      drivers/staging/iio/light/tsl2583.c
  48. 1 1
      drivers/staging/iio/light/tsl2x7x_core.c
  49. 1 1
      drivers/staging/iio/magnetometer/ak8975.c
  50. 1 1
      drivers/staging/iio/magnetometer/hmc5843.c
  51. 1 1
      drivers/staging/iio/meter/ade7753.c
  52. 1 1
      drivers/staging/iio/meter/ade7754.c
  53. 1 1
      drivers/staging/iio/meter/ade7758_core.c
  54. 1 1
      drivers/staging/iio/meter/ade7759.c
  55. 1 1
      drivers/staging/iio/meter/ade7854-i2c.c
  56. 1 1
      drivers/staging/iio/meter/ade7854-spi.c
  57. 1 1
      drivers/staging/iio/resolver/ad2s1200.c
  58. 1 1
      drivers/staging/iio/resolver/ad2s1210.c
  59. 1 1
      drivers/staging/iio/resolver/ad2s90.c
  60. 1 1
      drivers/staging/iio/trigger/iio-trig-bfin-timer.c
  61. 1 1
      drivers/staging/iio/trigger/iio-trig-gpio.c
  62. 1 1
      drivers/staging/iio/trigger/iio-trig-periodic-rtc.c

+ 1 - 1
drivers/staging/iio/accel/adis16201_core.c

@@ -224,7 +224,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adis16201_remove(struct spi_device *spi)
+static int adis16201_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct adis *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/accel/adis16203_core.c

@@ -191,7 +191,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adis16203_remove(struct spi_device *spi)
+static int adis16203_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct adis *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/accel/adis16204_core.c

@@ -231,7 +231,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adis16204_remove(struct spi_device *spi)
+static int adis16204_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct adis *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/accel/adis16209_core.c

@@ -224,7 +224,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adis16209_remove(struct spi_device *spi)
+static int adis16209_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct adis *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/accel/adis16220_core.c

@@ -484,7 +484,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adis16220_remove(struct spi_device *spi)
+static int adis16220_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 

+ 1 - 1
drivers/staging/iio/accel/adis16240_core.c

@@ -279,7 +279,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adis16240_remove(struct spi_device *spi)
+static int adis16240_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct adis *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/accel/kxsd9.c

@@ -261,7 +261,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit kxsd9_remove(struct spi_device *spi)
+static int kxsd9_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/accel/lis3l02dq_core.c

@@ -782,7 +782,7 @@ err_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit lis3l02dq_remove(struct spi_device *spi)
+static int lis3l02dq_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct lis3l02dq_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/accel/sca3000_core.c

@@ -1233,7 +1233,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit sca3000_remove(struct spi_device *spi)
+static int sca3000_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct sca3000_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/adc/ad7192.c

@@ -686,7 +686,7 @@ error_put_reg:
 	return ret;
 }
 
-static int __devexit ad7192_remove(struct spi_device *spi)
+static int ad7192_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ad7192_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/adc/ad7280a.c

@@ -950,7 +950,7 @@ error_free_device:
 	return ret;
 }
 
-static int __devexit ad7280_remove(struct spi_device *spi)
+static int ad7280_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ad7280_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/adc/ad7291.c

@@ -674,7 +674,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad7291_remove(struct i2c_client *client)
+static int ad7291_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 	struct ad7291_chip_info *chip = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/adc/ad7606_par.c

@@ -100,7 +100,7 @@ out1:
 	return ret;
 }
 
-static int __devexit ad7606_par_remove(struct platform_device *pdev)
+static int ad7606_par_remove(struct platform_device *pdev)
 {
 	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
 	struct resource *res;

+ 1 - 1
drivers/staging/iio/adc/ad7606_spi.c

@@ -55,7 +55,7 @@ static int ad7606_spi_probe(struct spi_device *spi)
 	return 0;
 }
 
-static int __devexit ad7606_spi_remove(struct spi_device *spi)
+static int ad7606_spi_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = dev_get_drvdata(&spi->dev);
 

+ 1 - 1
drivers/staging/iio/adc/ad7780.c

@@ -248,7 +248,7 @@ error_put_reg:
 	return ret;
 }
 
-static int __devexit ad7780_remove(struct spi_device *spi)
+static int ad7780_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ad7780_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/adc/ad7793.c

@@ -522,7 +522,7 @@ error_put_reg:
 	return ret;
 }
 
-static int __devexit ad7793_remove(struct spi_device *spi)
+static int ad7793_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ad7793_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/adc/ad7816.c

@@ -431,7 +431,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad7816_remove(struct spi_device *spi_dev)
+static int ad7816_remove(struct spi_device *spi_dev)
 {
 	struct iio_dev *indio_dev = dev_get_drvdata(&spi_dev->dev);
 	struct ad7816_chip_info *chip = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/adc/ad799x_core.c

@@ -932,7 +932,7 @@ error_put_reg:
 	return ret;
 }
 
-static __devexit int ad799x_remove(struct i2c_client *client)
+static int ad799x_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 	struct ad799x_state *st = iio_priv(indio_dev);

+ 3 - 3
drivers/staging/iio/adc/adt7410.c

@@ -792,7 +792,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adt7410_remove(struct device *dev, int irq)
+static int adt7410_remove(struct device *dev, int irq)
 {
 	struct iio_dev *indio_dev = dev_get_drvdata(dev);
 	unsigned long *adt7410_platform_data = dev->platform_data;
@@ -883,7 +883,7 @@ static int adt7410_i2c_probe(struct i2c_client *client,
 		&adt7410_i2c_ops);
 }
 
-static int __devexit adt7410_i2c_remove(struct i2c_client *client)
+static int adt7410_i2c_remove(struct i2c_client *client)
 {
 	return adt7410_remove(&client->dev, client->irq);
 }
@@ -1036,7 +1036,7 @@ static int adt7310_spi_probe(struct spi_device *spi)
 		spi_get_device_id(spi)->name, &adt7310_spi_ops);
 }
 
-static int __devexit adt7310_spi_remove(struct spi_device *spi)
+static int adt7310_spi_remove(struct spi_device *spi)
 {
 	return adt7410_remove(&spi->dev, spi->irq);
 }

+ 1 - 1
drivers/staging/iio/adc/lpc32xx_adc.c

@@ -207,7 +207,7 @@ errout1:
 	return retval;
 }
 
-static int __devexit lpc32xx_adc_remove(struct platform_device *pdev)
+static int lpc32xx_adc_remove(struct platform_device *pdev)
 {
 	struct iio_dev *iodev = platform_get_drvdata(pdev);
 	struct lpc32xx_adc_info *info = iio_priv(iodev);

+ 1 - 1
drivers/staging/iio/adc/mxs-lradc.c

@@ -551,7 +551,7 @@ err_addr:
 	return ret;
 }
 
-static int __devexit mxs_lradc_remove(struct platform_device *pdev)
+static int mxs_lradc_remove(struct platform_device *pdev)
 {
 	struct iio_dev *iio = platform_get_drvdata(pdev);
 	struct mxs_lradc *lradc = iio_priv(iio);

+ 1 - 1
drivers/staging/iio/adc/spear_adc.c

@@ -401,7 +401,7 @@ errout1:
 	return ret;
 }
 
-static int __devexit spear_adc_remove(struct platform_device *pdev)
+static int spear_adc_remove(struct platform_device *pdev)
 {
 	struct iio_dev *iodev = platform_get_drvdata(pdev);
 	struct spear_adc_info *info = iio_priv(iodev);

+ 1 - 1
drivers/staging/iio/addac/adt7316-i2c.c

@@ -108,7 +108,7 @@ static int adt7316_i2c_probe(struct i2c_client *client,
 	return adt7316_probe(&client->dev, &bus, id->name);
 }
 
-static int __devexit adt7316_i2c_remove(struct i2c_client *client)
+static int adt7316_i2c_remove(struct i2c_client *client)
 {
 	return adt7316_remove(&client->dev);
 }

+ 1 - 1
drivers/staging/iio/addac/adt7316-spi.c

@@ -116,7 +116,7 @@ static int adt7316_spi_probe(struct spi_device *spi_dev)
 	return adt7316_probe(&spi_dev->dev, &bus, spi_dev->modalias);
 }
 
-static int __devexit adt7316_spi_remove(struct spi_device *spi_dev)
+static int adt7316_spi_remove(struct spi_device *spi_dev)
 {
 	return adt7316_remove(&spi_dev->dev);
 }

+ 1 - 1
drivers/staging/iio/addac/adt7316.c

@@ -2216,7 +2216,7 @@ error_ret:
 }
 EXPORT_SYMBOL(adt7316_probe);
 
-int __devexit adt7316_remove(struct device *dev)
+int adt7316_remove(struct device *dev)
 {
 	struct iio_dev *indio_dev = dev_get_drvdata(dev);
 	struct adt7316_chip_info *chip = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/cdc/ad7150.c

@@ -628,7 +628,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad7150_remove(struct i2c_client *client)
+static int ad7150_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 

+ 1 - 1
drivers/staging/iio/cdc/ad7152.c

@@ -518,7 +518,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad7152_remove(struct i2c_client *client)
+static int ad7152_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 

+ 1 - 1
drivers/staging/iio/cdc/ad7746.c

@@ -768,7 +768,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad7746_remove(struct i2c_client *client)
+static int ad7746_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 

+ 1 - 1
drivers/staging/iio/frequency/ad5930.c

@@ -127,7 +127,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad5930_remove(struct spi_device *spi)
+static int ad5930_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/frequency/ad9832.c

@@ -324,7 +324,7 @@ error_put_reg:
 	return ret;
 }
 
-static int __devexit ad9832_remove(struct spi_device *spi)
+static int ad9832_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ad9832_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/frequency/ad9834.c

@@ -424,7 +424,7 @@ error_put_reg:
 	return ret;
 }
 
-static int __devexit ad9834_remove(struct spi_device *spi)
+static int ad9834_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ad9834_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/frequency/ad9850.c

@@ -113,7 +113,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad9850_remove(struct spi_device *spi)
+static int ad9850_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/frequency/ad9852.c

@@ -264,7 +264,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad9852_remove(struct spi_device *spi)
+static int ad9852_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/frequency/ad9910.c

@@ -397,7 +397,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad9910_remove(struct spi_device *spi)
+static int ad9910_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/frequency/ad9951.c

@@ -208,7 +208,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad9951_remove(struct spi_device *spi)
+static int ad9951_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 2 - 2
drivers/staging/iio/gyro/adis16060_core.c

@@ -184,7 +184,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit adis16060_r_remove(struct spi_device *spi)
+static int adis16060_r_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));
@@ -210,7 +210,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adis16060_w_remove(struct spi_device *spi)
+static int adis16060_w_remove(struct spi_device *spi)
 {
 	return 0;
 }

+ 1 - 1
drivers/staging/iio/gyro/adis16080_core.c

@@ -177,7 +177,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit adis16080_remove(struct spi_device *spi)
+static int adis16080_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/gyro/adis16130_core.c

@@ -154,7 +154,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit adis16130_remove(struct spi_device *spi)
+static int adis16130_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/gyro/adis16260_core.c

@@ -384,7 +384,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adis16260_remove(struct spi_device *spi)
+static int adis16260_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct adis16260_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/gyro/adxrs450_core.c

@@ -409,7 +409,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit adxrs450_remove(struct spi_device *spi)
+static int adxrs450_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/iio_hwmon.c

@@ -170,7 +170,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit iio_hwmon_remove(struct platform_device *pdev)
+static int iio_hwmon_remove(struct platform_device *pdev)
 {
 	struct iio_hwmon_state *st = platform_get_drvdata(pdev);
 

+ 1 - 1
drivers/staging/iio/impedance-analyzer/ad5933.c

@@ -787,7 +787,7 @@ error_put_reg:
 	return ret;
 }
 
-static __devexit int ad5933_remove(struct i2c_client *client)
+static int ad5933_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 	struct ad5933_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/imu/adis16400_core.c

@@ -1273,7 +1273,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit adis16400_remove(struct spi_device *spi)
+static int adis16400_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev =  spi_get_drvdata(spi);
 

+ 1 - 1
drivers/staging/iio/light/isl29018.c

@@ -598,7 +598,7 @@ exit:
 	return err;
 }
 
-static int __devexit isl29018_remove(struct i2c_client *client)
+static int isl29018_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 

+ 1 - 1
drivers/staging/iio/light/isl29028.c

@@ -526,7 +526,7 @@ exit_iio_free:
 	return ret;
 }
 
-static int __devexit isl29028_remove(struct i2c_client *client)
+static int isl29028_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 

+ 1 - 1
drivers/staging/iio/light/tsl2563.c

@@ -805,7 +805,7 @@ fail1:
 	return err;
 }
 
-static int __devexit tsl2563_remove(struct i2c_client *client)
+static int tsl2563_remove(struct i2c_client *client)
 {
 	struct tsl2563_chip *chip = i2c_get_clientdata(client);
 	struct iio_dev *indio_dev = iio_priv_to_dev(chip);

+ 1 - 1
drivers/staging/iio/light/tsl2583.c

@@ -923,7 +923,7 @@ static SIMPLE_DEV_PM_OPS(taos_pm_ops, taos_suspend, taos_resume);
 #define TAOS_PM_OPS NULL
 #endif
 
-static int __devexit taos_remove(struct i2c_client *client)
+static int taos_remove(struct i2c_client *client)
 {
 	iio_device_unregister(i2c_get_clientdata(client));
 	iio_device_free(i2c_get_clientdata(client));

+ 1 - 1
drivers/staging/iio/light/tsl2x7x_core.c

@@ -2026,7 +2026,7 @@ static int tsl2x7x_resume(struct device *dev)
 	return ret;
 }
 
-static int __devexit tsl2x7x_remove(struct i2c_client *client)
+static int tsl2x7x_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 

+ 1 - 1
drivers/staging/iio/magnetometer/ak8975.c

@@ -475,7 +475,7 @@ exit:
 	return err;
 }
 
-static int __devexit ak8975_remove(struct i2c_client *client)
+static int ak8975_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 	struct ak8975_data *data = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/magnetometer/hmc5843.c

@@ -704,7 +704,7 @@ exit:
 	return err;
 }
 
-static int __devexit hmc5843_remove(struct i2c_client *client)
+static int hmc5843_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 

+ 1 - 1
drivers/staging/iio/meter/ade7753.c

@@ -555,7 +555,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit ade7753_remove(struct spi_device *spi)
+static int ade7753_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 

+ 1 - 1
drivers/staging/iio/meter/ade7754.c

@@ -577,7 +577,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit ade7754_remove(struct spi_device *spi)
+static int ade7754_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 

+ 1 - 1
drivers/staging/iio/meter/ade7758_core.c

@@ -962,7 +962,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ade7758_remove(struct spi_device *spi)
+static int ade7758_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ade7758_state *st = iio_priv(indio_dev);

+ 1 - 1
drivers/staging/iio/meter/ade7759.c

@@ -499,7 +499,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit ade7759_remove(struct spi_device *spi)
+static int ade7759_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 

+ 1 - 1
drivers/staging/iio/meter/ade7854-i2c.c

@@ -231,7 +231,7 @@ static int ade7854_i2c_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int __devexit ade7854_i2c_remove(struct i2c_client *client)
+static int ade7854_i2c_remove(struct i2c_client *client)
 {
 	return ade7854_remove(i2c_get_clientdata(client));
 }

+ 1 - 1
drivers/staging/iio/meter/ade7854-spi.c

@@ -330,7 +330,7 @@ static int ade7854_spi_probe(struct spi_device *spi)
 	return 0;
 }
 
-static int __devexit ade7854_spi_remove(struct spi_device *spi)
+static int ade7854_spi_remove(struct spi_device *spi)
 {
 	ade7854_remove(spi_get_drvdata(spi));
 

+ 1 - 1
drivers/staging/iio/resolver/ad2s1200.c

@@ -149,7 +149,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad2s1200_remove(struct spi_device *spi)
+static int ad2s1200_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/resolver/ad2s1210.c

@@ -736,7 +736,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad2s1210_remove(struct spi_device *spi)
+static int ad2s1210_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 

+ 1 - 1
drivers/staging/iio/resolver/ad2s90.c

@@ -98,7 +98,7 @@ error_ret:
 	return ret;
 }
 
-static int __devexit ad2s90_remove(struct spi_device *spi)
+static int ad2s90_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
 	iio_device_free(spi_get_drvdata(spi));

+ 1 - 1
drivers/staging/iio/trigger/iio-trig-bfin-timer.c

@@ -275,7 +275,7 @@ out:
 	return ret;
 }
 
-static int __devexit iio_bfin_tmr_trigger_remove(struct platform_device *pdev)
+static int iio_bfin_tmr_trigger_remove(struct platform_device *pdev)
 {
 	struct bfin_tmr_state *st = platform_get_drvdata(pdev);
 

+ 1 - 1
drivers/staging/iio/trigger/iio-trig-gpio.c

@@ -130,7 +130,7 @@ error_free_completed_registrations:
 	return ret;
 }
 
-static int __devexit iio_gpio_trigger_remove(struct platform_device *pdev)
+static int iio_gpio_trigger_remove(struct platform_device *pdev)
 {
 	struct iio_trigger *trig, *trig2;
 	struct iio_gpio_trigger_info *trig_info;

+ 1 - 1
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c

@@ -167,7 +167,7 @@ error_free_completed_registrations:
 	return ret;
 }
 
-static int __devexit iio_trig_periodic_rtc_remove(struct platform_device *dev)
+static int iio_trig_periodic_rtc_remove(struct platform_device *dev)
 {
 	struct iio_trigger *trig, *trig2;
 	struct iio_prtc_trigger_info *trig_info;