hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Bill Pemberton 2012-11-19 13:26:37 -05:00 committed by Greg Kroah-Hartman
parent 4ae1c61ff2
commit 447d4f29ee
62 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/iio/accel/adis16201_core.c
View File

@ -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);

2
drivers/staging/iio/accel/adis16203_core.c
View File

@ -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);

2
drivers/staging/iio/accel/adis16204_core.c
View File

@ -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);

2
drivers/staging/iio/accel/adis16209_core.c
View File

@ -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);

2
drivers/staging/iio/accel/adis16220_core.c
View File

@ -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);

2
drivers/staging/iio/accel/adis16240_core.c
View File

@ -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);

2
drivers/staging/iio/accel/kxsd9.c
View File

@ -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));

2
drivers/staging/iio/accel/lis3l02dq_core.c
View File

@ -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);

2
drivers/staging/iio/accel/sca3000_core.c
View File

@ -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);

2
drivers/staging/iio/adc/ad7192.c
View File

@ -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);

2
drivers/staging/iio/adc/ad7280a.c
View File

@ -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);

2
drivers/staging/iio/adc/ad7291.c
View File

@ -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);

2
drivers/staging/iio/adc/ad7606_par.c
View File

@ -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;

2
drivers/staging/iio/adc/ad7606_spi.c
View File

@ -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);

2
drivers/staging/iio/adc/ad7780.c
View File

@ -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);

2
drivers/staging/iio/adc/ad7793.c
View File

@ -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);

2
drivers/staging/iio/adc/ad7816.c
View File

@ -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);

2
drivers/staging/iio/adc/ad799x_core.c
View File

@ -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);

6
drivers/staging/iio/adc/adt7410.c
View File

@ -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);
}

2
drivers/staging/iio/adc/lpc32xx_adc.c
View File

@ -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);

2
drivers/staging/iio/adc/mxs-lradc.c
View File

@ -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);

2
drivers/staging/iio/adc/spear_adc.c
View File

@ -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);

2
drivers/staging/iio/addac/adt7316-i2c.c
View File

@ -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);
}

2
drivers/staging/iio/addac/adt7316-spi.c
View File

@ -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);
}

2
drivers/staging/iio/addac/adt7316.c
View File

@ -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);

2
drivers/staging/iio/cdc/ad7150.c
View File

@ -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);

2
drivers/staging/iio/cdc/ad7152.c
View File

@ -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);

2
drivers/staging/iio/cdc/ad7746.c
View File

@ -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);

2
drivers/staging/iio/frequency/ad5930.c
View File

@ -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));

2
drivers/staging/iio/frequency/ad9832.c
View File

@ -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);

2
drivers/staging/iio/frequency/ad9834.c
View File

@ -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);

2
drivers/staging/iio/frequency/ad9850.c
View File

@ -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));

2
drivers/staging/iio/frequency/ad9852.c
View File

@ -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));

2
drivers/staging/iio/frequency/ad9910.c
View File

@ -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));

2
drivers/staging/iio/frequency/ad9951.c
View File

@ -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));

4
drivers/staging/iio/gyro/adis16060_core.c
View File

@ -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;
}

2
drivers/staging/iio/gyro/adis16080_core.c
View File

@ -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));

2
drivers/staging/iio/gyro/adis16130_core.c
View File

@ -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));

2
drivers/staging/iio/gyro/adis16260_core.c
View File

@ -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);

2
drivers/staging/iio/gyro/adxrs450_core.c
View File

@ -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));

2
drivers/staging/iio/iio_hwmon.c
View File

@ -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);

2
drivers/staging/iio/impedance-analyzer/ad5933.c
View File

@ -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);

2
drivers/staging/iio/imu/adis16400_core.c
View File

@ -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);

2
drivers/staging/iio/light/isl29018.c
View File

@ -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);

2
drivers/staging/iio/light/isl29028.c
View File

@ -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);

2
drivers/staging/iio/light/tsl2563.c
View File

@ -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);

2
drivers/staging/iio/light/tsl2583.c
View File

@ -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));

2
drivers/staging/iio/light/tsl2x7x_core.c
View File

@ -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);

2
drivers/staging/iio/magnetometer/ak8975.c
View File

@ -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);

2
drivers/staging/iio/magnetometer/hmc5843.c
View File

@ -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);

2
drivers/staging/iio/meter/ade7753.c
View File

@ -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);

2
drivers/staging/iio/meter/ade7754.c
View File

@ -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);

2
drivers/staging/iio/meter/ade7758_core.c
View File

@ -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);

2
drivers/staging/iio/meter/ade7759.c
View File

@ -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);

2
drivers/staging/iio/meter/ade7854-i2c.c
View File

@ -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));
}

2
drivers/staging/iio/meter/ade7854-spi.c
View File

@ -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));

2
drivers/staging/iio/resolver/ad2s1200.c
View File

@ -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));

2
drivers/staging/iio/resolver/ad2s1210.c
View File

@ -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);

2
drivers/staging/iio/resolver/ad2s90.c
View File

@ -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));

2
drivers/staging/iio/trigger/iio-trig-bfin-timer.c
View File

@ -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);

2
drivers/staging/iio/trigger/iio-trig-gpio.c
View File

@ -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;

2
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
View File

@ -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;