diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:21:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 14:31:41 -0800 |
commit | 4ae1c61ff2ba4fea4e4c1a045cb1f34520608789 (patch) | |
tree | 6420a76236efc0c183899fbf8da21a871f1ad626 /drivers/staging/iio/adc | |
parent | 1a6a8a8414f740f1dfde762837eeb3f2ce835919 (diff) |
staging: iio: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit 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>
Diffstat (limited to 'drivers/staging/iio/adc')
-rw-r--r-- | drivers/staging/iio/adc/ad7192.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7280a.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7291.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7606_par.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7606_spi.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7780.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7793.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7816.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad799x_core.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/adt7410.c | 6 | ||||
-rw-r--r-- | drivers/staging/iio/adc/lpc32xx_adc.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/spear_adc.c | 2 |
13 files changed, 15 insertions, 15 deletions
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c index aeaa61d49f51..41b5fe85f451 100644 --- a/drivers/staging/iio/adc/ad7192.c +++ b/drivers/staging/iio/adc/ad7192.c @@ -606,7 +606,7 @@ static const struct iio_chan_spec ad7192_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(8), }; -static int __devinit ad7192_probe(struct spi_device *spi) +static int ad7192_probe(struct spi_device *spi) { const struct ad7192_platform_data *pdata = spi->dev.platform_data; struct ad7192_state *st; diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c index e7cb3b2fe67f..6e9984373efa 100644 --- a/drivers/staging/iio/adc/ad7280a.c +++ b/drivers/staging/iio/adc/ad7280a.c @@ -832,7 +832,7 @@ static const struct ad7280_platform_data ad7793_default_pdata = { .thermistor_term_en = true, }; -static int __devinit ad7280_probe(struct spi_device *spi) +static int ad7280_probe(struct spi_device *spi) { const struct ad7280_platform_data *pdata = spi->dev.platform_data; struct ad7280_state *st; diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c index 029b39c0ba60..bea5cc4529e3 100644 --- a/drivers/staging/iio/adc/ad7291.c +++ b/drivers/staging/iio/adc/ad7291.c @@ -580,7 +580,7 @@ static const struct iio_info ad7291_info = { .event_attrs = &ad7291_event_attribute_group, }; -static int __devinit ad7291_probe(struct i2c_client *client, +static int ad7291_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct ad7291_chip_info *chip; diff --git a/drivers/staging/iio/adc/ad7606_par.c b/drivers/staging/iio/adc/ad7606_par.c index a53faafec070..b45002dfc8b8 100644 --- a/drivers/staging/iio/adc/ad7606_par.c +++ b/drivers/staging/iio/adc/ad7606_par.c @@ -47,7 +47,7 @@ static const struct ad7606_bus_ops ad7606_par8_bops = { .read_block = ad7606_par8_read_block, }; -static int __devinit ad7606_par_probe(struct platform_device *pdev) +static int ad7606_par_probe(struct platform_device *pdev) { struct resource *res; struct iio_dev *indio_dev; diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c index 099d347da52d..78d68659665e 100644 --- a/drivers/staging/iio/adc/ad7606_spi.c +++ b/drivers/staging/iio/adc/ad7606_spi.c @@ -39,7 +39,7 @@ static const struct ad7606_bus_ops ad7606_spi_bops = { .read_block = ad7606_spi_read_block, }; -static int __devinit ad7606_spi_probe(struct spi_device *spi) +static int ad7606_spi_probe(struct spi_device *spi) { struct iio_dev *indio_dev; diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c index 0a1328b8657f..eb487d3c8d53 100644 --- a/drivers/staging/iio/adc/ad7780.c +++ b/drivers/staging/iio/adc/ad7780.c @@ -164,7 +164,7 @@ static const struct iio_info ad7780_info = { .driver_module = THIS_MODULE, }; -static int __devinit ad7780_probe(struct spi_device *spi) +static int ad7780_probe(struct spi_device *spi) { struct ad7780_platform_data *pdata = spi->dev.platform_data; struct ad7780_state *st; diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c index 691a7be6f5cb..d7a272e7b6b1 100644 --- a/drivers/staging/iio/adc/ad7793.c +++ b/drivers/staging/iio/adc/ad7793.c @@ -441,7 +441,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = { }, }; -static int __devinit ad7793_probe(struct spi_device *spi) +static int ad7793_probe(struct spi_device *spi) { const struct ad7793_platform_data *pdata = spi->dev.platform_data; struct ad7793_state *st; diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c index c5fb9476a2d1..b49fc6c53927 100644 --- a/drivers/staging/iio/adc/ad7816.c +++ b/drivers/staging/iio/adc/ad7816.c @@ -341,7 +341,7 @@ static const struct iio_info ad7816_info = { * device probe and remove */ -static int __devinit ad7816_probe(struct spi_device *spi_dev) +static int ad7816_probe(struct spi_device *spi_dev) { struct ad7816_chip_info *chip; struct iio_dev *indio_dev; diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c index 990050700afc..758527987fdd 100644 --- a/drivers/staging/iio/adc/ad799x_core.c +++ b/drivers/staging/iio/adc/ad799x_core.c @@ -854,7 +854,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { }, }; -static int __devinit ad799x_probe(struct i2c_client *client, +static int ad799x_probe(struct i2c_client *client, const struct i2c_device_id *id) { int ret; diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c index 6493cd0a48dd..f41994dd8d6d 100644 --- a/drivers/staging/iio/adc/adt7410.c +++ b/drivers/staging/iio/adc/adt7410.c @@ -695,7 +695,7 @@ static const struct iio_info adt7410_info = { * device probe and remove */ -static int __devinit adt7410_probe(struct device *dev, int irq, +static int adt7410_probe(struct device *dev, int irq, const char *name, const struct adt7410_ops *ops) { unsigned long *adt7410_platform_data = dev->platform_data; @@ -876,7 +876,7 @@ static const struct adt7410_ops adt7410_i2c_ops = { .write_byte = adt7410_i2c_write_byte, }; -static int __devinit adt7410_i2c_probe(struct i2c_client *client, +static int adt7410_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { return adt7410_probe(&client->dev, client->irq, id->name, @@ -1030,7 +1030,7 @@ static const struct adt7410_ops adt7310_spi_ops = { .write_byte = adt7310_spi_write_byte, }; -static int __devinit adt7310_spi_probe(struct spi_device *spi) +static int adt7310_spi_probe(struct spi_device *spi) { return adt7410_probe(&spi->dev, spi->irq, spi_get_device_id(spi)->name, &adt7310_spi_ops); diff --git a/drivers/staging/iio/adc/lpc32xx_adc.c b/drivers/staging/iio/adc/lpc32xx_adc.c index 10c59622671f..f38aa92146a3 100644 --- a/drivers/staging/iio/adc/lpc32xx_adc.c +++ b/drivers/staging/iio/adc/lpc32xx_adc.c @@ -126,7 +126,7 @@ static irqreturn_t lpc32xx_adc_isr(int irq, void *dev_id) return IRQ_HANDLED; } -static int __devinit lpc32xx_adc_probe(struct platform_device *pdev) +static int lpc32xx_adc_probe(struct platform_device *pdev) { struct lpc32xx_adc_info *info = NULL; struct resource *res; diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index 3b467d8c5882..b91cf850b078 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c @@ -466,7 +466,7 @@ static void mxs_lradc_hw_stop(struct mxs_lradc *lradc) writel(0, lradc->base + LRADC_DELAY(i)); } -static int __devinit mxs_lradc_probe(struct platform_device *pdev) +static int mxs_lradc_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct mxs_lradc *lradc; diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/spear_adc.c index 0b83e2e1f410..e1a55b368a65 100644 --- a/drivers/staging/iio/adc/spear_adc.c +++ b/drivers/staging/iio/adc/spear_adc.c @@ -291,7 +291,7 @@ static const struct iio_info spear_adc_iio_info = { .driver_module = THIS_MODULE, }; -static int __devinit spear_adc_probe(struct platform_device *pdev) +static int spear_adc_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; struct device *dev = &pdev->dev; |