Skip to content

Commit

Permalink
staging: iio: remove use of __devexit_p
Browse files Browse the repository at this point in the history
CONFIG_HOTPLUG is going away as an option so __devexit_p 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>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 447d4f2 commit e543acf
Show file tree
Hide file tree
Showing 61 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16201_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static struct spi_driver adis16201_driver = {
.owner = THIS_MODULE,
},
.probe = adis16201_probe,
.remove = __devexit_p(adis16201_remove),
.remove = adis16201_remove,
};
module_spi_driver(adis16201_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16203_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ static struct spi_driver adis16203_driver = {
.owner = THIS_MODULE,
},
.probe = adis16203_probe,
.remove = __devexit_p(adis16203_remove),
.remove = adis16203_remove,
};
module_spi_driver(adis16203_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16204_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ static struct spi_driver adis16204_driver = {
.owner = THIS_MODULE,
},
.probe = adis16204_probe,
.remove = __devexit_p(adis16204_remove),
.remove = adis16204_remove,
};
module_spi_driver(adis16204_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16209_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static struct spi_driver adis16209_driver = {
.owner = THIS_MODULE,
},
.probe = adis16209_probe,
.remove = __devexit_p(adis16209_remove),
.remove = adis16209_remove,
};
module_spi_driver(adis16209_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16220_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ static struct spi_driver adis16220_driver = {
.owner = THIS_MODULE,
},
.probe = adis16220_probe,
.remove = __devexit_p(adis16220_remove),
.remove = adis16220_remove,
};
module_spi_driver(adis16220_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/adis16240_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ static struct spi_driver adis16240_driver = {
.owner = THIS_MODULE,
},
.probe = adis16240_probe,
.remove = __devexit_p(adis16240_remove),
.remove = adis16240_remove,
};
module_spi_driver(adis16240_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/kxsd9.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ static struct spi_driver kxsd9_driver = {
.owner = THIS_MODULE,
},
.probe = kxsd9_probe,
.remove = __devexit_p(kxsd9_remove),
.remove = kxsd9_remove,
.id_table = kxsd9_id,
};
module_spi_driver(kxsd9_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/lis3l02dq_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ static struct spi_driver lis3l02dq_driver = {
.owner = THIS_MODULE,
},
.probe = lis3l02dq_probe,
.remove = __devexit_p(lis3l02dq_remove),
.remove = lis3l02dq_remove,
};
module_spi_driver(lis3l02dq_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/accel/sca3000_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,7 @@ static struct spi_driver sca3000_driver = {
.owner = THIS_MODULE,
},
.probe = sca3000_probe,
.remove = __devexit_p(sca3000_remove),
.remove = sca3000_remove,
.id_table = sca3000_id,
};
module_spi_driver(sca3000_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7192.c
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ static struct spi_driver ad7192_driver = {
.owner = THIS_MODULE,
},
.probe = ad7192_probe,
.remove = __devexit_p(ad7192_remove),
.remove = ad7192_remove,
.id_table = ad7192_id,
};
module_spi_driver(ad7192_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7280a.c
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@ static struct spi_driver ad7280_driver = {
.owner = THIS_MODULE,
},
.probe = ad7280_probe,
.remove = __devexit_p(ad7280_remove),
.remove = ad7280_remove,
.id_table = ad7280_id,
};
module_spi_driver(ad7280_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7291.c
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ static struct i2c_driver ad7291_driver = {
.name = KBUILD_MODNAME,
},
.probe = ad7291_probe,
.remove = __devexit_p(ad7291_remove),
.remove = ad7291_remove,
.id_table = ad7291_id,
};
module_i2c_driver(ad7291_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7606_par.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ MODULE_DEVICE_TABLE(platform, ad7606_driver_ids);

static struct platform_driver ad7606_driver = {
.probe = ad7606_par_probe,
.remove = __devexit_p(ad7606_par_remove),
.remove = ad7606_par_remove,
.id_table = ad7606_driver_ids,
.driver = {
.name = "ad7606",
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7606_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static struct spi_driver ad7606_driver = {
.pm = AD7606_SPI_PM_OPS,
},
.probe = ad7606_spi_probe,
.remove = __devexit_p(ad7606_spi_remove),
.remove = ad7606_spi_remove,
.id_table = ad7606_id,
};
module_spi_driver(ad7606_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7780.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ static struct spi_driver ad7780_driver = {
.owner = THIS_MODULE,
},
.probe = ad7780_probe,
.remove = __devexit_p(ad7780_remove),
.remove = ad7780_remove,
.id_table = ad7780_id,
};
module_spi_driver(ad7780_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7793.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ static struct spi_driver ad7793_driver = {
.owner = THIS_MODULE,
},
.probe = ad7793_probe,
.remove = __devexit_p(ad7793_remove),
.remove = ad7793_remove,
.id_table = ad7793_id,
};
module_spi_driver(ad7793_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad7816.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ static struct spi_driver ad7816_driver = {
.owner = THIS_MODULE,
},
.probe = ad7816_probe,
.remove = __devexit_p(ad7816_remove),
.remove = ad7816_remove,
.id_table = ad7816_id,
};
module_spi_driver(ad7816_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/ad799x_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ static struct i2c_driver ad799x_driver = {
.name = "ad799x",
},
.probe = ad799x_probe,
.remove = __devexit_p(ad799x_remove),
.remove = ad799x_remove,
.id_table = ad799x_id,
};
module_i2c_driver(ad799x_driver);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/iio/adc/adt7410.c
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ static struct i2c_driver adt7410_driver = {
.name = "adt7410",
},
.probe = adt7410_i2c_probe,
.remove = __devexit_p(adt7410_i2c_remove),
.remove = adt7410_i2c_remove,
.id_table = adt7410_id,
};

Expand Down Expand Up @@ -1053,7 +1053,7 @@ static struct spi_driver adt7310_driver = {
.owner = THIS_MODULE,
},
.probe = adt7310_spi_probe,
.remove = __devexit_p(adt7310_spi_remove),
.remove = adt7310_spi_remove,
.id_table = adt7310_id,
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/lpc32xx_adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_adc_match);

static struct platform_driver lpc32xx_adc_driver = {
.probe = lpc32xx_adc_probe,
.remove = __devexit_p(lpc32xx_adc_remove),
.remove = lpc32xx_adc_remove,
.driver = {
.name = MOD_NAME,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/mxs-lradc.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ static struct platform_driver mxs_lradc_driver = {
.of_match_table = mxs_lradc_dt_ids,
},
.probe = mxs_lradc_probe,
.remove = __devexit_p(mxs_lradc_remove),
.remove = mxs_lradc_remove,
};

module_platform_driver(mxs_lradc_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/spear_adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ MODULE_DEVICE_TABLE(of, spear_adc_dt_ids);

static struct platform_driver spear_adc_driver = {
.probe = spear_adc_probe,
.remove = __devexit_p(spear_adc_remove),
.remove = spear_adc_remove,
.driver = {
.name = MOD_NAME,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/addac/adt7316-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ static struct i2c_driver adt7316_driver = {
.owner = THIS_MODULE,
},
.probe = adt7316_i2c_probe,
.remove = __devexit_p(adt7316_i2c_remove),
.remove = adt7316_i2c_remove,
.id_table = adt7316_i2c_id,
};
module_i2c_driver(adt7316_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/addac/adt7316-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static struct spi_driver adt7316_driver = {
.owner = THIS_MODULE,
},
.probe = adt7316_spi_probe,
.remove = __devexit_p(adt7316_spi_remove),
.remove = adt7316_spi_remove,
.id_table = adt7316_spi_id,
};
module_spi_driver(adt7316_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/cdc/ad7150.c
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ static struct i2c_driver ad7150_driver = {
.name = "ad7150",
},
.probe = ad7150_probe,
.remove = __devexit_p(ad7150_remove),
.remove = ad7150_remove,
.id_table = ad7150_id,
};
module_i2c_driver(ad7150_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/cdc/ad7152.c
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ static struct i2c_driver ad7152_driver = {
.name = KBUILD_MODNAME,
},
.probe = ad7152_probe,
.remove = __devexit_p(ad7152_remove),
.remove = ad7152_remove,
.id_table = ad7152_id,
};
module_i2c_driver(ad7152_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/cdc/ad7746.c
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ static struct i2c_driver ad7746_driver = {
.name = KBUILD_MODNAME,
},
.probe = ad7746_probe,
.remove = __devexit_p(ad7746_remove),
.remove = ad7746_remove,
.id_table = ad7746_id,
};
module_i2c_driver(ad7746_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/frequency/ad5930.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static struct spi_driver ad5930_driver = {
.owner = THIS_MODULE,
},
.probe = ad5930_probe,
.remove = __devexit_p(ad5930_remove),
.remove = ad5930_remove,
};
module_spi_driver(ad5930_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/frequency/ad9832.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ static struct spi_driver ad9832_driver = {
.owner = THIS_MODULE,
},
.probe = ad9832_probe,
.remove = __devexit_p(ad9832_remove),
.remove = ad9832_remove,
.id_table = ad9832_id,
};
module_spi_driver(ad9832_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/frequency/ad9834.c
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ static struct spi_driver ad9834_driver = {
.owner = THIS_MODULE,
},
.probe = ad9834_probe,
.remove = __devexit_p(ad9834_remove),
.remove = ad9834_remove,
.id_table = ad9834_id,
};
module_spi_driver(ad9834_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/frequency/ad9850.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static struct spi_driver ad9850_driver = {
.owner = THIS_MODULE,
},
.probe = ad9850_probe,
.remove = __devexit_p(ad9850_remove),
.remove = ad9850_remove,
};
module_spi_driver(ad9850_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/frequency/ad9852.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ static struct spi_driver ad9852_driver = {
.owner = THIS_MODULE,
},
.probe = ad9852_probe,
.remove = __devexit_p(ad9852_remove),
.remove = ad9852_remove,
};
module_spi_driver(ad9852_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/frequency/ad9910.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ static struct spi_driver ad9910_driver = {
.owner = THIS_MODULE,
},
.probe = ad9910_probe,
.remove = __devexit_p(ad9910_remove),
.remove = ad9910_remove,
};
module_spi_driver(ad9910_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/frequency/ad9951.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static struct spi_driver ad9951_driver = {
.owner = THIS_MODULE,
},
.probe = ad9951_probe,
.remove = __devexit_p(ad9951_remove),
.remove = ad9951_remove,
};
module_spi_driver(ad9951_driver);

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/iio/gyro/adis16060_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static struct spi_driver adis16060_r_driver = {
.owner = THIS_MODULE,
},
.probe = adis16060_r_probe,
.remove = __devexit_p(adis16060_r_remove),
.remove = adis16060_r_remove,
};

static struct spi_driver adis16060_w_driver = {
Expand All @@ -230,7 +230,7 @@ static struct spi_driver adis16060_w_driver = {
.owner = THIS_MODULE,
},
.probe = adis16060_w_probe,
.remove = __devexit_p(adis16060_w_remove),
.remove = adis16060_w_remove,
};

static __init int adis16060_init(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/gyro/adis16080_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static struct spi_driver adis16080_driver = {
.owner = THIS_MODULE,
},
.probe = adis16080_probe,
.remove = __devexit_p(adis16080_remove),
.remove = adis16080_remove,
};
module_spi_driver(adis16080_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/gyro/adis16130_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ static struct spi_driver adis16130_driver = {
.owner = THIS_MODULE,
},
.probe = adis16130_probe,
.remove = __devexit_p(adis16130_remove),
.remove = adis16130_remove,
};
module_spi_driver(adis16130_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/gyro/adis16260_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ static struct spi_driver adis16260_driver = {
.owner = THIS_MODULE,
},
.probe = adis16260_probe,
.remove = __devexit_p(adis16260_remove),
.remove = adis16260_remove,
.id_table = adis16260_id,
};
module_spi_driver(adis16260_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/gyro/adxrs450_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ static struct spi_driver adxrs450_driver = {
.owner = THIS_MODULE,
},
.probe = adxrs450_probe,
.remove = __devexit_p(adxrs450_remove),
.remove = adxrs450_remove,
.id_table = adxrs450_id,
};
module_spi_driver(adxrs450_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/iio_hwmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static struct platform_driver __refdata iio_hwmon_driver = {
.owner = THIS_MODULE,
},
.probe = iio_hwmon_probe,
.remove = __devexit_p(iio_hwmon_remove),
.remove = iio_hwmon_remove,
};

module_platform_driver(iio_hwmon_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/impedance-analyzer/ad5933.c
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ static struct i2c_driver ad5933_driver = {
.name = "ad5933",
},
.probe = ad5933_probe,
.remove = __devexit_p(ad5933_remove),
.remove = ad5933_remove,
.id_table = ad5933_id,
};
module_i2c_driver(ad5933_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/imu/adis16400_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ static struct spi_driver adis16400_driver = {
},
.id_table = adis16400_id,
.probe = adis16400_probe,
.remove = __devexit_p(adis16400_remove),
.remove = adis16400_remove,
};
module_spi_driver(adis16400_driver);

Expand Down
Loading

0 comments on commit e543acf

Please sign in to comment.