Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 338092
b: refs/heads/master
c: 447d4f2
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent d72adf5 commit 5fbadd1
Show file tree
Hide file tree
Showing 63 changed files with 66 additions and 66 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4ae1c61ff2ba4fea4e4c1a045cb1f34520608789
refs/heads/master: 447d4f29ee3fa62f13c65688bb7b74d5a9a0d767
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/adis16201_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ static int adis16201_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/adis16203_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static int adis16203_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/adis16204_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ static int adis16204_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/adis16209_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ static int adis16209_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/adis16220_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ static int adis16220_probe(struct spi_device *spi)
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/adis16240_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ static int adis16240_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/kxsd9.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ static int kxsd9_probe(struct spi_device *spi)
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));
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/lis3l02dq_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ static int lis3l02dq_stop_device(struct iio_dev *indio_dev)
}

/* 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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/accel/sca3000_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,7 @@ static int sca3000_stop_all_interrupts(struct sca3000_state *st)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad7192.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ static int ad7192_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad7280a.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ static int ad7280_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad7291.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ static int ad7291_probe(struct i2c_client *client,
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad7606_par.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static int ad7606_par_probe(struct platform_device *pdev)
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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad7606_spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad7780.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ static int ad7780_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad7793.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ static int ad7793_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad7816.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ static int ad7816_probe(struct spi_device *spi_dev)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/ad799x_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ static int ad799x_probe(struct i2c_client *client,
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);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/iio/adc/adt7410.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ static int adt7410_probe(struct device *dev, int irq,
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;
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/lpc32xx_adc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ static int lpc32xx_adc_probe(struct platform_device *pdev)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/mxs-lradc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ static int mxs_lradc_probe(struct platform_device *pdev)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/adc/spear_adc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ static int spear_adc_probe(struct platform_device *pdev)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/addac/adt7316-i2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/addac/adt7316-spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/addac/adt7316.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2216,7 +2216,7 @@ int adt7316_probe(struct device *dev, struct adt7316_bus *bus,
}
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/cdc/ad7150.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ static int ad7150_probe(struct i2c_client *client,
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/cdc/ad7152.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ static int ad7152_probe(struct i2c_client *client,
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/cdc/ad7746.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ static int ad7746_probe(struct i2c_client *client,
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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/frequency/ad5930.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static int ad5930_probe(struct spi_device *spi)
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));
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/frequency/ad9832.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ static int ad9832_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/frequency/ad9834.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ static int ad9834_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/frequency/ad9850.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static int ad9850_probe(struct spi_device *spi)
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));
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/frequency/ad9852.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static int ad9852_probe(struct spi_device *spi)
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));
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/frequency/ad9910.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ static int ad9910_probe(struct spi_device *spi)
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));
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/frequency/ad9951.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ static int ad9951_probe(struct spi_device *spi)
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));
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/gyro/adis16060_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static int adis16060_r_probe(struct spi_device *spi)
}

/* 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));
Expand All @@ -210,7 +210,7 @@ static int adis16060_w_probe(struct spi_device *spi)
return ret;
}

static int __devexit adis16060_w_remove(struct spi_device *spi)
static int adis16060_w_remove(struct spi_device *spi)
{
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/gyro/adis16080_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ static int adis16080_probe(struct spi_device *spi)
}

/* 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));
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/gyro/adis16130_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static int adis16130_probe(struct spi_device *spi)
}

/* 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));
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/gyro/adis16260_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ static int adis16260_probe(struct spi_device *spi)
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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/gyro/adxrs450_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ static int adxrs450_probe(struct spi_device *spi)
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));
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/iio/iio_hwmon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
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);

Expand Down
Loading

0 comments on commit 5fbadd1

Please sign in to comment.