Drivers: iio: remove __dev* attributes.

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c
index 3310cbbd41e7..29f653dab2f7 100644
--- a/drivers/iio/dac/ad5446.c
+++ b/drivers/iio/dac/ad5446.c
@@ -212,8 +212,8 @@ static const struct iio_info ad5446_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad5446_probe(struct device *dev, const char *name,
-        const struct ad5446_chip_info *chip_info)
+static int ad5446_probe(struct device *dev, const char *name,
+                        const struct ad5446_chip_info *chip_info)
 {
         struct ad5446_state *st;
         struct iio_dev *indio_dev;
@@ -461,7 +461,7 @@ static const struct spi_device_id ad5446_spi_ids[] = {
 };
 MODULE_DEVICE_TABLE(spi, ad5446_spi_ids);
 
-static int __devinit ad5446_spi_probe(struct spi_device *spi)
+static int ad5446_spi_probe(struct spi_device *spi)
 {
         const struct spi_device_id *id = spi_get_device_id(spi);
 
@@ -469,7 +469,7 @@ static int __devinit ad5446_spi_probe(struct spi_device *spi)
                 &ad5446_spi_chip_info[id->driver_data]);
 }
 
-static int __devexit ad5446_spi_remove(struct spi_device *spi)
+static int ad5446_spi_remove(struct spi_device *spi)
 {
         return ad5446_remove(&spi->dev);
 }
@@ -480,7 +480,7 @@ static struct spi_driver ad5446_spi_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad5446_spi_probe,
-        .remove         = __devexit_p(ad5446_spi_remove),
+        .remove         = ad5446_spi_remove,
         .id_table       = ad5446_spi_ids,
 };
 
@@ -539,14 +539,14 @@ static const struct ad5446_chip_info ad5446_i2c_chip_info[] = {
         },
 };
 
-static int __devinit ad5446_i2c_probe(struct i2c_client *i2c,
-        const struct i2c_device_id *id)
+static int ad5446_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
 {
         return ad5446_probe(&i2c->dev, id->name,
                 &ad5446_i2c_chip_info[id->driver_data]);
 }
 
-static int __devexit ad5446_i2c_remove(struct i2c_client *i2c)
+static int ad5446_i2c_remove(struct i2c_client *i2c)
 {
         return ad5446_remove(&i2c->dev);
 }
@@ -568,7 +568,7 @@ static struct i2c_driver ad5446_i2c_driver = {
                    .owner = THIS_MODULE,
         },
         .probe = ad5446_i2c_probe,
-        .remove = __devexit_p(ad5446_i2c_remove),
+        .remove = ad5446_i2c_remove,
         .id_table = ad5446_i2c_ids,
 };