Merge 3.8-rc5 into staging-next

This resolves a merge issue with a iio driver, and the zram code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

34 files changed, 180 insertions, 139 deletions

diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 253684ebc572..dd8ea4284934 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -277,7 +277,7 @@ static int accel_3d_parse_report(struct platform_device *pdev,
 }
 
 /* Function to initialize the processing for usage id */
-static int __devinit hid_accel_3d_probe(struct platform_device *pdev)
+static int hid_accel_3d_probe(struct platform_device *pdev)
 {
         int ret = 0;
         static const char *name = "accel_3d";
@@ -374,7 +374,7 @@ error_ret:
 }
 
 /* Function to deinitialize the processing for usage id */
-static int __devinit hid_accel_3d_remove(struct platform_device *pdev)
+static int hid_accel_3d_remove(struct platform_device *pdev)
 {
         struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index e36107dc30b9..bbad9b94cd75 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -367,7 +367,7 @@ static const struct ad7266_chan_info ad7266_chan_infos[] = {
         },
 };
 
-static void __devinit ad7266_init_channels(struct iio_dev *indio_dev)
+static void ad7266_init_channels(struct iio_dev *indio_dev)
 {
         struct ad7266_state *st = iio_priv(indio_dev);
         bool is_differential, is_signed;
@@ -391,7 +391,7 @@ static const char * const ad7266_gpio_labels[] = {
         "AD0", "AD1", "AD2",
 };
 
-static int __devinit ad7266_probe(struct spi_device *spi)
+static int ad7266_probe(struct spi_device *spi)
 {
         struct ad7266_platform_data *pdata = spi->dev.platform_data;
         struct iio_dev *indio_dev;
@@ -498,7 +498,7 @@ error_put_reg:
         return ret;
 }
 
-static int __devexit ad7266_remove(struct spi_device *spi)
+static int ad7266_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad7266_state *st = iio_priv(indio_dev);
@@ -529,7 +529,7 @@ static struct spi_driver ad7266_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7266_probe,
-        .remove         = __devexit_p(ad7266_remove),
+        .remove         = ad7266_remove,
         .id_table       = ad7266_id,
 };
 module_spi_driver(ad7266_driver);
diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
index 2364807a5d6c..b34d754994d5 100644
--- a/drivers/iio/adc/ad7298.c
+++ b/drivers/iio/adc/ad7298.c
@@ -292,7 +292,7 @@ static const struct iio_info ad7298_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad7298_probe(struct spi_device *spi)
+static int ad7298_probe(struct spi_device *spi)
 {
         struct ad7298_platform_data *pdata = spi->dev.platform_data;
         struct ad7298_state *st;
@@ -370,7 +370,7 @@ error_free:
         return ret;
 }
 
-static int __devexit ad7298_remove(struct spi_device *spi)
+static int ad7298_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad7298_state *st = iio_priv(indio_dev);
@@ -398,7 +398,7 @@ static struct spi_driver ad7298_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7298_probe,
-        .remove         = __devexit_p(ad7298_remove),
+        .remove         = ad7298_remove,
         .id_table       = ad7298_id,
 };
 module_spi_driver(ad7298_driver);
diff --git a/drivers/iio/adc/ad7476.c b/drivers/iio/adc/ad7476.c
index 330248bfebae..1491fa6debb2 100644
--- a/drivers/iio/adc/ad7476.c
+++ b/drivers/iio/adc/ad7476.c
@@ -207,7 +207,7 @@ static const struct iio_info ad7476_info = {
         .read_raw = &ad7476_read_raw,
 };
 
-static int __devinit ad7476_probe(struct spi_device *spi)
+static int ad7476_probe(struct spi_device *spi)
 {
         struct ad7476_state *st;
         struct iio_dev *indio_dev;
@@ -277,7 +277,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad7476_remove(struct spi_device *spi)
+static int ad7476_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad7476_state *st = iio_priv(indio_dev);
@@ -322,7 +322,7 @@ static struct spi_driver ad7476_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7476_probe,
-        .remove         = __devexit_p(ad7476_remove),
+        .remove         = ad7476_remove,
         .id_table       = ad7476_id,
 };
 module_spi_driver(ad7476_driver);
diff --git a/drivers/iio/adc/ad7791.c b/drivers/iio/adc/ad7791.c
index e93740843b2b..5e8d1da6887f 100644
--- a/drivers/iio/adc/ad7791.c
+++ b/drivers/iio/adc/ad7791.c
@@ -325,8 +325,8 @@ static const struct iio_info ad7791_no_filter_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad7791_setup(struct ad7791_state *st,
-        struct ad7791_platform_data *pdata)
+static int ad7791_setup(struct ad7791_state *st,
+                        struct ad7791_platform_data *pdata)
 {
         /* Set to poweron-reset default values */
         st->mode = AD7791_MODE_BUFFER;
@@ -349,7 +349,7 @@ static int __devinit ad7791_setup(struct ad7791_state *st,
                 st->mode);
 }
 
-static int __devinit ad7791_probe(struct spi_device *spi)
+static int ad7791_probe(struct spi_device *spi)
 {
         struct ad7791_platform_data *pdata = spi->dev.platform_data;
         struct iio_dev *indio_dev;
@@ -418,7 +418,7 @@ err_iio_free:
         return ret;
 }
 
-static int __devexit ad7791_remove(struct spi_device *spi)
+static int ad7791_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad7791_state *st = iio_priv(indio_dev);
@@ -450,7 +450,7 @@ static struct spi_driver ad7791_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7791_probe,
-        .remove         = __devexit_p(ad7791_remove),
+        .remove         = ad7791_remove,
         .id_table       = ad7791_spi_ids,
 };
 module_spi_driver(ad7791_driver);
diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c
index 81153fafac7a..a33d5cd1a536 100644
--- a/drivers/iio/adc/ad7887.c
+++ b/drivers/iio/adc/ad7887.c
@@ -233,7 +233,7 @@ static const struct iio_info ad7887_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad7887_probe(struct spi_device *spi)
+static int ad7887_probe(struct spi_device *spi)
 {
         struct ad7887_platform_data *pdata = spi->dev.platform_data;
         struct ad7887_state *st;
@@ -340,7 +340,7 @@ error_free:
         return ret;
 }
 
-static int __devexit ad7887_remove(struct spi_device *spi)
+static int ad7887_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad7887_state *st = iio_priv(indio_dev);
@@ -368,7 +368,7 @@ static struct spi_driver ad7887_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7887_probe,
-        .remove         = __devexit_p(ad7887_remove),
+        .remove         = ad7887_remove,
         .id_table       = ad7887_id,
 };
 module_spi_driver(ad7887_driver);
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 315bed1f401f..a526c0e3aaa8 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -514,7 +514,7 @@ static const struct iio_info at91_adc_info = {
         .read_raw = &at91_adc_read_raw,
 };
 
-static int __devinit at91_adc_probe(struct platform_device *pdev)
+static int at91_adc_probe(struct platform_device *pdev)
 {
         unsigned int prsc, mstrclk, ticks, adc_clk;
         int ret;
@@ -678,7 +678,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit at91_adc_remove(struct platform_device *pdev)
+static int at91_adc_remove(struct platform_device *pdev)
 {
         struct iio_dev *idev = platform_get_drvdata(pdev);
         struct at91_adc_state *st = iio_priv(idev);
@@ -702,7 +702,7 @@ MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);
 
 static struct platform_driver at91_adc_driver = {
         .probe = at91_adc_probe,
-        .remove = __devexit_p(at91_adc_remove),
+        .remove = at91_adc_remove,
         .driver = {
                    .name = "at91_adc",
                    .of_match_table = of_match_ptr(at91_adc_dt_ids),
diff --git a/drivers/iio/adc/lp8788_adc.c b/drivers/iio/adc/lp8788_adc.c
index f8ae81cae9cf..f8bcb1f5892d 100644
--- a/drivers/iio/adc/lp8788_adc.c
+++ b/drivers/iio/adc/lp8788_adc.c
@@ -193,7 +193,7 @@ static inline void lp8788_iio_map_unregister(struct iio_dev *indio_dev,
         iio_map_array_unregister(indio_dev, adc->map);
 }
 
-static int __devinit lp8788_adc_probe(struct platform_device *pdev)
+static int lp8788_adc_probe(struct platform_device *pdev)
 {
         struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
         struct iio_dev *indio_dev;
@@ -236,7 +236,7 @@ err_iio_map:
         return ret;
 }
 
-static int __devexit lp8788_adc_remove(struct platform_device *pdev)
+static int lp8788_adc_remove(struct platform_device *pdev)
 {
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
         struct lp8788_adc *adc = iio_priv(indio_dev);
@@ -250,7 +250,7 @@ static int __devexit lp8788_adc_remove(struct platform_device *pdev)
 
 static struct platform_driver lp8788_adc_driver = {
         .probe = lp8788_adc_probe,
-        .remove = __devexit_p(lp8788_adc_remove),
+        .remove = lp8788_adc_remove,
         .driver = {
                 .name = LP8788_DEV_ADC,
                 .owner = THIS_MODULE,
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index aac572290cbf..eba1034d8606 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -1403,7 +1403,7 @@ static int max1363_initial_setup(struct max1363_state *st)
         return max1363_set_scan_mode(st);
 }
 
-static int __devinit max1363_alloc_scan_masks(struct iio_dev *indio_dev)
+static int max1363_alloc_scan_masks(struct iio_dev *indio_dev)
 {
         struct max1363_state *st = iio_priv(indio_dev);
         unsigned long *masks;
@@ -1483,8 +1483,50 @@ static const struct iio_buffer_setup_ops max1363_buffered_setup_ops = {
         .predisable = &iio_triggered_buffer_predisable,
 };
 
-static int __devinit max1363_probe(struct i2c_client *client,
-                                   const struct i2c_device_id *id)
+static int max1363_register_buffered_funcs_and_init(struct iio_dev *indio_dev)
+{
+        struct max1363_state *st = iio_priv(indio_dev);
+        int ret = 0;
+
+        indio_dev->buffer = iio_kfifo_allocate(indio_dev);
+        if (!indio_dev->buffer) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        indio_dev->pollfunc = iio_alloc_pollfunc(NULL,
+                                                 &max1363_trigger_handler,
+                                                 IRQF_ONESHOT,
+                                                 indio_dev,
+                                                 "%s_consumer%d",
+                                                 st->client->name,
+                                                 indio_dev->id);
+        if (indio_dev->pollfunc == NULL) {
+                ret = -ENOMEM;
+                goto error_deallocate_sw_rb;
+        }
+        /* Buffer functions - here trigger setup related */
+        indio_dev->setup_ops = &max1363_buffered_setup_ops;
+
+        /* Flag that polled buffering is possible */
+        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
+
+        return 0;
+
+error_deallocate_sw_rb:
+        iio_kfifo_free(indio_dev->buffer);
+error_ret:
+        return ret;
+}
+
+static void max1363_buffer_cleanup(struct iio_dev *indio_dev)
+{
+        /* ensure that the trigger has been detached */
+        iio_dealloc_pollfunc(indio_dev->pollfunc);
+        iio_kfifo_free(indio_dev->buffer);
+}
+
+static int max1363_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
 {
         int ret;
         struct max1363_state *st;
@@ -1576,7 +1618,7 @@ error_out:
         return ret;
 }
 
-static int __devexit max1363_remove(struct i2c_client *client)
+static int max1363_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
         struct max1363_state *st = iio_priv(indio_dev);
@@ -1639,7 +1681,7 @@ static struct i2c_driver max1363_driver = {
                 .name = "max1363",
         },
         .probe = max1363_probe,
-        .remove = __devexit_p(max1363_remove),
+        .remove = max1363_remove,
         .id_table = max1363_id,
 };
 module_i2c_driver(max1363_driver);
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 02a43c87a8a3..cd030e100c39 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -136,7 +136,7 @@ static const struct iio_info tiadc_info = {
         .read_raw = &tiadc_read_raw,
 };
 
-static int __devinit tiadc_probe(struct platform_device *pdev)
+static int tiadc_probe(struct platform_device *pdev)
 {
         struct iio_dev          *indio_dev;
         struct tiadc_device     *adc_dev;
@@ -188,7 +188,7 @@ err_ret:
         return err;
 }
 
-static int __devexit tiadc_remove(struct platform_device *pdev)
+static int tiadc_remove(struct platform_device *pdev)
 {
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
 
@@ -250,7 +250,7 @@ static struct platform_driver tiadc_driver = {
                 .pm     = TIADC_PM_OPS,
         },
         .probe  = tiadc_probe,
-        .remove = __devexit_p(tiadc_remove),
+        .remove = tiadc_remove,
 };
 
 module_platform_driver(tiadc_driver);
diff --git a/drivers/iio/adc/viperboard_adc.c b/drivers/iio/adc/viperboard_adc.c
index 10136a8b20d4..ad0261533dee 100644
--- a/drivers/iio/adc/viperboard_adc.c
+++ b/drivers/iio/adc/viperboard_adc.c
@@ -116,7 +116,7 @@ static const struct iio_info vprbrd_adc_iio_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit vprbrd_adc_probe(struct platform_device *pdev)
+static int vprbrd_adc_probe(struct platform_device *pdev)
 {
         struct vprbrd *vb = dev_get_drvdata(pdev->dev.parent);
         struct vprbrd_adc *adc;
@@ -154,7 +154,7 @@ error:
         return ret;
 }
 
-static int __devexit vprbrd_adc_remove(struct platform_device *pdev)
+static int vprbrd_adc_remove(struct platform_device *pdev)
 {
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
 
@@ -170,7 +170,7 @@ static struct platform_driver vprbrd_adc_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = vprbrd_adc_probe,
-        .remove         = __devexit_p(vprbrd_adc_remove),
+        .remove         = vprbrd_adc_remove,
 };
 
 module_platform_driver(vprbrd_adc_driver);
diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad8366.c
index d8281cdbfc4a..d6c0af23a2a7 100644
--- a/drivers/iio/amplifiers/ad8366.c
+++ b/drivers/iio/amplifiers/ad8366.c
@@ -133,7 +133,7 @@ static const struct iio_chan_spec ad8366_channels[] = {
         AD8366_CHAN(1),
 };
 
-static int __devinit ad8366_probe(struct spi_device *spi)
+static int ad8366_probe(struct spi_device *spi)
 {
         struct iio_dev *indio_dev;
         struct ad8366_state *st;
@@ -182,7 +182,7 @@ error_put_reg:
         return ret;
 }
 
-static int __devexit ad8366_remove(struct spi_device *spi)
+static int ad8366_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad8366_state *st = iio_priv(indio_dev);
@@ -211,7 +211,7 @@ static struct spi_driver ad8366_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad8366_probe,
-        .remove         = __devexit_p(ad8366_remove),
+        .remove         = ad8366_remove,
         .id_table       = ad8366_id,
 };
 
diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c
index eb281a2c295b..2fe1d4edcb2f 100644
--- a/drivers/iio/dac/ad5064.c
+++ b/drivers/iio/dac/ad5064.c
@@ -424,8 +424,8 @@ static const char * const ad5064_vref_name(struct ad5064_state *st,
         return st->chip_info->shared_vref ? "vref" : ad5064_vref_names[vref];
 }
 
-static int __devinit ad5064_probe(struct device *dev, enum ad5064_type type,
-        const char *name, ad5064_write_func write)
+static int ad5064_probe(struct device *dev, enum ad5064_type type,
+                        const char *name, ad5064_write_func write)
 {
         struct iio_dev *indio_dev;
         struct ad5064_state *st;
@@ -495,7 +495,7 @@ error_free:
         return ret;
 }
 
-static int __devexit ad5064_remove(struct device *dev)
+static int ad5064_remove(struct device *dev)
 {
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct ad5064_state *st = iio_priv(indio_dev);
@@ -523,7 +523,7 @@ static int ad5064_spi_write(struct ad5064_state *st, unsigned int cmd,
         return spi_write(spi, &st->data.spi, sizeof(st->data.spi));
 }
 
-static int __devinit ad5064_spi_probe(struct spi_device *spi)
+static int ad5064_spi_probe(struct spi_device *spi)
 {
         const struct spi_device_id *id = spi_get_device_id(spi);
 
@@ -531,7 +531,7 @@ static int __devinit ad5064_spi_probe(struct spi_device *spi)
                                 ad5064_spi_write);
 }
 
-static int __devexit ad5064_spi_remove(struct spi_device *spi)
+static int ad5064_spi_remove(struct spi_device *spi)
 {
         return ad5064_remove(&spi->dev);
 }
@@ -563,7 +563,7 @@ static struct spi_driver ad5064_spi_driver = {
                    .owner = THIS_MODULE,
         },
         .probe = ad5064_spi_probe,
-        .remove = __devexit_p(ad5064_spi_remove),
+        .remove = ad5064_spi_remove,
         .id_table = ad5064_spi_ids,
 };
 
@@ -596,14 +596,14 @@ static int ad5064_i2c_write(struct ad5064_state *st, unsigned int cmd,
         return i2c_master_send(i2c, st->data.i2c, 3);
 }
 
-static int __devinit ad5064_i2c_probe(struct i2c_client *i2c,
+static int ad5064_i2c_probe(struct i2c_client *i2c,
         const struct i2c_device_id *id)
 {
         return ad5064_probe(&i2c->dev, id->driver_data, id->name,
                                                 ad5064_i2c_write);
 }
 
-static int __devexit ad5064_i2c_remove(struct i2c_client *i2c)
+static int ad5064_i2c_remove(struct i2c_client *i2c)
 {
         return ad5064_remove(&i2c->dev);
 }
@@ -625,7 +625,7 @@ static struct i2c_driver ad5064_i2c_driver = {
                    .owner = THIS_MODULE,
         },
         .probe = ad5064_i2c_probe,
-        .remove = __devexit_p(ad5064_i2c_remove),
+        .remove = ad5064_i2c_remove,
         .id_table = ad5064_i2c_ids,
 };
 
diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c
index 8fce84fe70b1..54b46fd3aede 100644
--- a/drivers/iio/dac/ad5360.c
+++ b/drivers/iio/dac/ad5360.c
@@ -433,7 +433,7 @@ static const char * const ad5360_vref_name[] = {
          "vref0", "vref1", "vref2"
 };
 
-static int __devinit ad5360_alloc_channels(struct iio_dev *indio_dev)
+static int ad5360_alloc_channels(struct iio_dev *indio_dev)
 {
         struct ad5360_state *st = iio_priv(indio_dev);
         struct iio_chan_spec *channels;
@@ -456,7 +456,7 @@ static int __devinit ad5360_alloc_channels(struct iio_dev *indio_dev)
         return 0;
 }
 
-static int __devinit ad5360_probe(struct spi_device *spi)
+static int ad5360_probe(struct spi_device *spi)
 {
         enum ad5360_type type = spi_get_device_id(spi)->driver_data;
         struct iio_dev *indio_dev;
@@ -524,7 +524,7 @@ error_free:
         return ret;
 }
 
-static int __devexit ad5360_remove(struct spi_device *spi)
+static int ad5360_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad5360_state *st = iio_priv(indio_dev);
@@ -560,7 +560,7 @@ static struct spi_driver ad5360_driver = {
                    .owner = THIS_MODULE,
         },
         .probe = ad5360_probe,
-        .remove = __devexit_p(ad5360_remove),
+        .remove = ad5360_remove,
         .id_table = ad5360_ids,
 };
 module_spi_driver(ad5360_driver);
diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c
index 4aca1895ce52..483fc379a2da 100644
--- a/drivers/iio/dac/ad5380.c
+++ b/drivers/iio/dac/ad5380.c
@@ -338,7 +338,7 @@ static const struct ad5380_chip_info ad5380_chip_info_tbl[] = {
         },
 };
 
-static int __devinit ad5380_alloc_channels(struct iio_dev *indio_dev)
+static int ad5380_alloc_channels(struct iio_dev *indio_dev)
 {
         struct ad5380_state *st = iio_priv(indio_dev);
         struct iio_chan_spec *channels;
@@ -361,8 +361,8 @@ static int __devinit ad5380_alloc_channels(struct iio_dev *indio_dev)
         return 0;
 }
 
-static int __devinit ad5380_probe(struct device *dev, struct regmap *regmap,
-        enum ad5380_type type, const char *name)
+static int ad5380_probe(struct device *dev, struct regmap *regmap,
+                        enum ad5380_type type, const char *name)
 {
         struct iio_dev *indio_dev;
         struct ad5380_state *st;
@@ -445,7 +445,7 @@ error_out:
         return ret;
 }
 
-static int __devexit ad5380_remove(struct device *dev)
+static int ad5380_remove(struct device *dev)
 {
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct ad5380_state *st = iio_priv(indio_dev);
@@ -482,7 +482,7 @@ static const struct regmap_config ad5380_regmap_config = {
 
 #if IS_ENABLED(CONFIG_SPI_MASTER)
 
-static int __devinit ad5380_spi_probe(struct spi_device *spi)
+static int ad5380_spi_probe(struct spi_device *spi)
 {
         const struct spi_device_id *id = spi_get_device_id(spi);
         struct regmap *regmap;
@@ -495,7 +495,7 @@ static int __devinit ad5380_spi_probe(struct spi_device *spi)
         return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name);
 }
 
-static int __devexit ad5380_spi_remove(struct spi_device *spi)
+static int ad5380_spi_remove(struct spi_device *spi)
 {
         return ad5380_remove(&spi->dev);
 }
@@ -527,7 +527,7 @@ static struct spi_driver ad5380_spi_driver = {
                    .owner = THIS_MODULE,
         },
         .probe = ad5380_spi_probe,
-        .remove = __devexit_p(ad5380_spi_remove),
+        .remove = ad5380_spi_remove,
         .id_table = ad5380_spi_ids,
 };
 
@@ -556,8 +556,8 @@ static inline void ad5380_spi_unregister_driver(void)
 
 #if IS_ENABLED(CONFIG_I2C)
 
-static int __devinit ad5380_i2c_probe(struct i2c_client *i2c,
-        const struct i2c_device_id *id)
+static int ad5380_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
 {
         struct regmap *regmap;
 
@@ -569,7 +569,7 @@ static int __devinit ad5380_i2c_probe(struct i2c_client *i2c,
         return ad5380_probe(&i2c->dev, regmap, id->driver_data, id->name);
 }
 
-static int __devexit ad5380_i2c_remove(struct i2c_client *i2c)
+static int ad5380_i2c_remove(struct i2c_client *i2c)
 {
         return ad5380_remove(&i2c->dev);
 }
@@ -601,7 +601,7 @@ static struct i2c_driver ad5380_i2c_driver = {
                    .owner = THIS_MODULE,
         },
         .probe = ad5380_i2c_probe,
-        .remove = __devexit_p(ad5380_i2c_remove),
+        .remove = ad5380_i2c_remove,
         .id_table = ad5380_i2c_ids,
 };
 
diff --git a/drivers/iio/dac/ad5421.c b/drivers/iio/dac/ad5421.c
index cdbc5bf25c31..43be948db83e 100644
--- a/drivers/iio/dac/ad5421.c
+++ b/drivers/iio/dac/ad5421.c
@@ -449,7 +449,7 @@ static const struct iio_info ad5421_info = {
         .driver_module =        THIS_MODULE,
 };
 
-static int __devinit ad5421_probe(struct spi_device *spi)
+static int ad5421_probe(struct spi_device *spi)
 {
         struct ad5421_platform_data *pdata = dev_get_platdata(&spi->dev);
         struct iio_dev *indio_dev;
@@ -516,7 +516,7 @@ error_free:
         return ret;
 }
 
-static int __devexit ad5421_remove(struct spi_device *spi)
+static int ad5421_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
@@ -534,7 +534,7 @@ static struct spi_driver ad5421_driver = {
                    .owner = THIS_MODULE,
         },
         .probe = ad5421_probe,
-        .remove = __devexit_p(ad5421_remove),
+        .remove = ad5421_remove,
 };
 module_spi_driver(ad5421_driver);
 
diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c
index ecb639540dff..f5583aedfb59 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;
@@ -465,7 +465,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);
 
@@ -473,7 +473,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);
 }
@@ -484,7 +484,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,
 };
 
@@ -543,14 +543,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);
 }
@@ -572,7 +572,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,
 };
 
diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c
index 0ee6f8eeba8d..c4731b7b577b 100644
--- a/drivers/iio/dac/ad5449.c
+++ b/drivers/iio/dac/ad5449.c
@@ -266,7 +266,7 @@ static const char *ad5449_vref_name(struct ad5449 *st, int n)
                 return "VREFB";
 }
 
-static int __devinit ad5449_spi_probe(struct spi_device *spi)
+static int ad5449_spi_probe(struct spi_device *spi)
 {
         struct ad5449_platform_data *pdata = spi->dev.platform_data;
         const struct spi_device_id *id = spi_get_device_id(spi);
@@ -333,7 +333,7 @@ error_free:
         return ret;
 }
 
-static int __devexit ad5449_spi_remove(struct spi_device *spi)
+static int ad5449_spi_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad5449 *st = iio_priv(indio_dev);
@@ -366,7 +366,7 @@ static struct spi_driver ad5449_spi_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad5449_spi_probe,
-        .remove = __devexit_p(ad5449_spi_remove),
+        .remove = ad5449_spi_remove,
         .id_table = ad5449_spi_ids,
 };
 module_spi_driver(ad5449_spi_driver);
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c
index 7f7c026b9d8a..0661829f2773 100644
--- a/drivers/iio/dac/ad5504.c
+++ b/drivers/iio/dac/ad5504.c
@@ -277,7 +277,7 @@ static const struct iio_chan_spec ad5504_channels[] = {
         AD5504_CHANNEL(3),
 };
 
-static int __devinit ad5504_probe(struct spi_device *spi)
+static int ad5504_probe(struct spi_device *spi)
 {
         struct ad5504_platform_data *pdata = spi->dev.platform_data;
         struct iio_dev *indio_dev;
@@ -356,7 +356,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad5504_remove(struct spi_device *spi)
+static int ad5504_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad5504_state *st = iio_priv(indio_dev);
@@ -387,7 +387,7 @@ static struct spi_driver ad5504_driver = {
                    .owner = THIS_MODULE,
                    },
         .probe = ad5504_probe,
-        .remove = __devexit_p(ad5504_remove),
+        .remove = ad5504_remove,
         .id_table = ad5504_id,
 };
 module_spi_driver(ad5504_driver);
diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c
index 14ea3dbf4902..f6e116627b71 100644
--- a/drivers/iio/dac/ad5624r_spi.c
+++ b/drivers/iio/dac/ad5624r_spi.c
@@ -220,7 +220,7 @@ static const struct ad5624r_chip_info ad5624r_chip_info_tbl[] = {
         },
 };
 
-static int __devinit ad5624r_probe(struct spi_device *spi)
+static int ad5624r_probe(struct spi_device *spi)
 {
         struct ad5624r_state *st;
         struct iio_dev *indio_dev;
@@ -286,7 +286,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad5624r_remove(struct spi_device *spi)
+static int ad5624r_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad5624r_state *st = iio_priv(indio_dev);
@@ -318,7 +318,7 @@ static struct spi_driver ad5624r_driver = {
                    .owner = THIS_MODULE,
                    },
         .probe = ad5624r_probe,
-        .remove = __devexit_p(ad5624r_remove),
+        .remove = ad5624r_remove,
         .id_table = ad5624r_id,
 };
 module_spi_driver(ad5624r_driver);
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index 01eb1d0e4e41..ca9609d7a15c 100644
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -313,7 +313,7 @@ static const struct ad5686_chip_info ad5686_chip_info_tbl[] = {
 };
 
 
-static int __devinit ad5686_probe(struct spi_device *spi)
+static int ad5686_probe(struct spi_device *spi)
 {
         struct ad5686_state *st;
         struct iio_dev *indio_dev;
@@ -383,7 +383,7 @@ error_put_reg:
         return ret;
 }
 
-static int __devexit ad5686_remove(struct spi_device *spi)
+static int ad5686_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad5686_state *st = iio_priv(indio_dev);
@@ -412,7 +412,7 @@ static struct spi_driver ad5686_driver = {
                    .owner = THIS_MODULE,
                    },
         .probe = ad5686_probe,
-        .remove = __devexit_p(ad5686_remove),
+        .remove = ad5686_remove,
         .id_table = ad5686_id,
 };
 module_spi_driver(ad5686_driver);
diff --git a/drivers/iio/dac/ad5755.c b/drivers/iio/dac/ad5755.c
index 5db3506034c5..0869bbd27d30 100644
--- a/drivers/iio/dac/ad5755.c
+++ b/drivers/iio/dac/ad5755.c
@@ -447,8 +447,8 @@ static bool ad5755_is_valid_mode(struct ad5755_state *st, enum ad5755_mode mode)
         }
 }
 
-static int __devinit ad5755_setup_pdata(struct iio_dev *indio_dev,
-        const struct ad5755_platform_data *pdata)
+static int ad5755_setup_pdata(struct iio_dev *indio_dev,
+                              const struct ad5755_platform_data *pdata)
 {
         struct ad5755_state *st = iio_priv(indio_dev);
         unsigned int val;
@@ -503,7 +503,7 @@ static int __devinit ad5755_setup_pdata(struct iio_dev *indio_dev,
         return 0;
 }
 
-static bool __devinit ad5755_is_voltage_mode(enum ad5755_mode mode)
+static bool ad5755_is_voltage_mode(enum ad5755_mode mode)
 {
         switch (mode) {
         case AD5755_MODE_VOLTAGE_0V_5V:
@@ -516,8 +516,8 @@ static bool __devinit ad5755_is_voltage_mode(enum ad5755_mode mode)
         }
 }
 
-static int __devinit ad5755_init_channels(struct iio_dev *indio_dev,
-        const struct ad5755_platform_data *pdata)
+static int ad5755_init_channels(struct iio_dev *indio_dev,
+                                const struct ad5755_platform_data *pdata)
 {
         struct ad5755_state *st = iio_priv(indio_dev);
         struct iio_chan_spec *channels = st->channels;
@@ -562,7 +562,7 @@ static const struct ad5755_platform_data ad5755_default_pdata = {
         },
 };
 
-static int __devinit ad5755_probe(struct spi_device *spi)
+static int ad5755_probe(struct spi_device *spi)
 {
         enum ad5755_type type = spi_get_device_id(spi)->driver_data;
         const struct ad5755_platform_data *pdata = dev_get_platdata(&spi->dev);
@@ -614,7 +614,7 @@ error_free:
         return ret;
 }
 
-static int __devexit ad5755_remove(struct spi_device *spi)
+static int ad5755_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
@@ -640,7 +640,7 @@ static struct spi_driver ad5755_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad5755_probe,
-        .remove = __devexit_p(ad5755_remove),
+        .remove = ad5755_remove,
         .id_table = ad5755_id,
 };
 module_spi_driver(ad5755_driver);
diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c
index ffce30447445..7f9045e6daa4 100644
--- a/drivers/iio/dac/ad5764.c
+++ b/drivers/iio/dac/ad5764.c
@@ -273,7 +273,7 @@ static const struct iio_info ad5764_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad5764_probe(struct spi_device *spi)
+static int ad5764_probe(struct spi_device *spi)
 {
         enum ad5764_type type = spi_get_device_id(spi)->driver_data;
         struct iio_dev *indio_dev;
@@ -340,7 +340,7 @@ error_free:
         return ret;
 }
 
-static int __devexit ad5764_remove(struct spi_device *spi)
+static int ad5764_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad5764_state *st = iio_priv(indio_dev);
@@ -372,7 +372,7 @@ static struct spi_driver ad5764_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad5764_probe,
-        .remove = __devexit_p(ad5764_remove),
+        .remove = ad5764_remove,
         .id_table = ad5764_ids,
 };
 module_spi_driver(ad5764_driver);
diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c
index 6efe83e32ac6..6407b5407ddd 100644
--- a/drivers/iio/dac/ad5791.c
+++ b/drivers/iio/dac/ad5791.c
@@ -346,7 +346,7 @@ static const struct iio_info ad5791_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad5791_probe(struct spi_device *spi)
+static int ad5791_probe(struct spi_device *spi)
 {
         struct ad5791_platform_data *pdata = spi->dev.platform_data;
         struct iio_dev *indio_dev;
@@ -448,7 +448,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad5791_remove(struct spi_device *spi)
+static int ad5791_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad5791_state *st = iio_priv(indio_dev);
@@ -484,7 +484,7 @@ static struct spi_driver ad5791_driver = {
                    .owner = THIS_MODULE,
                    },
         .probe = ad5791_probe,
-        .remove = __devexit_p(ad5791_remove),
+        .remove = ad5791_remove,
         .id_table = ad5791_id,
 };
 module_spi_driver(ad5791_driver);
diff --git a/drivers/iio/dac/max517.c b/drivers/iio/dac/max517.c
index c3d748c25939..352abe2004a4 100644
--- a/drivers/iio/dac/max517.c
+++ b/drivers/iio/dac/max517.c
@@ -156,7 +156,7 @@ static const struct iio_chan_spec max517_channels[] = {
         MAX517_CHANNEL(1)
 };
 
-static int __devinit max517_probe(struct i2c_client *client,
+static int max517_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
         struct max517_data *data;
@@ -210,7 +210,7 @@ exit:
         return err;
 }
 
-static int __devexit max517_remove(struct i2c_client *client)
+static int max517_remove(struct i2c_client *client)
 {
         iio_device_unregister(i2c_get_clientdata(client));
         iio_device_free(i2c_get_clientdata(client));
@@ -232,7 +232,7 @@ static struct i2c_driver max517_driver = {
                 .pm             = MAX517_PM_OPS,
         },
         .probe          = max517_probe,
-        .remove         =  __devexit_p(max517_remove),
+        .remove         = max517_remove,
         .id_table       = max517_id,
 };
 module_i2c_driver(max517_driver);
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
index e0e168bd5b45..8f88cc4059a2 100644
--- a/drivers/iio/dac/mcp4725.c
+++ b/drivers/iio/dac/mcp4725.c
@@ -141,8 +141,8 @@ static const struct iio_info mcp4725_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit mcp4725_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int mcp4725_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
 {
         struct mcp4725_data *data;
         struct iio_dev *indio_dev;
@@ -195,7 +195,7 @@ exit:
         return err;
 }
 
-static int __devexit mcp4725_remove(struct i2c_client *client)
+static int mcp4725_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -217,7 +217,7 @@ static struct i2c_driver mcp4725_driver = {
                 .pm     = MCP4725_PM_OPS,
         },
         .probe          = mcp4725_probe,
-        .remove         = __devexit_p(mcp4725_remove),
+        .remove         = mcp4725_remove,
         .id_table       = mcp4725_id,
 };
 module_i2c_driver(mcp4725_driver);
diff --git a/drivers/iio/frequency/ad9523.c b/drivers/iio/frequency/ad9523.c
index b737c64a402d..80307473e3a9 100644
--- a/drivers/iio/frequency/ad9523.c
+++ b/drivers/iio/frequency/ad9523.c
@@ -959,7 +959,7 @@ static int ad9523_setup(struct iio_dev *indio_dev)
         return 0;
 }
 
-static int __devinit ad9523_probe(struct spi_device *spi)
+static int ad9523_probe(struct spi_device *spi)
 {
         struct ad9523_platform_data *pdata = spi->dev.platform_data;
         struct iio_dev *indio_dev;
@@ -1020,7 +1020,7 @@ error_put_reg:
         return ret;
 }
 
-static int __devexit ad9523_remove(struct spi_device *spi)
+static int ad9523_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad9523_state *st = iio_priv(indio_dev);
@@ -1049,7 +1049,7 @@ static struct spi_driver ad9523_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad9523_probe,
-        .remove         = __devexit_p(ad9523_remove),
+        .remove         = ad9523_remove,
         .id_table       = ad9523_id,
 };
 module_spi_driver(ad9523_driver);
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index c7de8b5a01ff..a884252ac66b 100644
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -355,7 +355,7 @@ static const struct iio_info adf4350_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adf4350_probe(struct spi_device *spi)
+static int adf4350_probe(struct spi_device *spi)
 {
         struct adf4350_platform_data *pdata = spi->dev.platform_data;
         struct iio_dev *indio_dev;
@@ -440,7 +440,7 @@ error_put_reg:
         return ret;
 }
 
-static int __devexit adf4350_remove(struct spi_device *spi)
+static int adf4350_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct adf4350_state *st = iio_priv(indio_dev);
@@ -476,7 +476,7 @@ static struct spi_driver adf4350_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = adf4350_probe,
-        .remove         = __devexit_p(adf4350_remove),
+        .remove         = adf4350_remove,
         .id_table       = adf4350_id,
 };
 module_spi_driver(adf4350_driver);
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index 1a64f88d1e89..fcfc83a9f861 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -277,7 +277,7 @@ static int gyro_3d_parse_report(struct platform_device *pdev,
 }
 
 /* Function to initialize the processing for usage id */
-static int __devinit hid_gyro_3d_probe(struct platform_device *pdev)
+static int hid_gyro_3d_probe(struct platform_device *pdev)
 {
         int ret = 0;
         static const char *name = "gyro_3d";
@@ -374,7 +374,7 @@ error_ret:
 }
 
 /* Function to deinitialize the processing for usage id */
-static int __devinit hid_gyro_3d_remove(struct platform_device *pdev)
+static int hid_gyro_3d_remove(struct platform_device *pdev)
 {
         struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index 36d210a06b28..d5b9d39d95b2 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -286,8 +286,8 @@ static const struct iio_info adjd_s311_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adjd_s311_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int adjd_s311_probe(struct i2c_client *client,
+                           const struct i2c_device_id *id)
 {
         struct adjd_s311_data *data;
         struct iio_dev *indio_dev;
@@ -330,7 +330,7 @@ exit:
         return err;
 }
 
-static int __devexit adjd_s311_remove(struct i2c_client *client)
+static int adjd_s311_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
         struct adjd_s311_data *data = iio_priv(indio_dev);
@@ -354,7 +354,7 @@ static struct i2c_driver adjd_s311_driver = {
                 .name   = ADJD_S311_DRV_NAME,
         },
         .probe          = adjd_s311_probe,
-        .remove         = __devexit_p(adjd_s311_remove),
+        .remove         = adjd_s311_remove,
         .id_table       = adjd_s311_id,
 };
 module_i2c_driver(adjd_s311_driver);
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 6ab987a13c79..3d7e8c9b4beb 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -244,7 +244,7 @@ static int als_parse_report(struct platform_device *pdev,
 }
 
 /* Function to initialize the processing for usage id */
-static int __devinit hid_als_probe(struct platform_device *pdev)
+static int hid_als_probe(struct platform_device *pdev)
 {
         int ret = 0;
         static const char *name = "als";
@@ -340,7 +340,7 @@ error_ret:
 }
 
 /* Function to deinitialize the processing for usage id */
-static int __devinit hid_als_remove(struct platform_device *pdev)
+static int hid_als_remove(struct platform_device *pdev)
 {
         struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
diff --git a/drivers/iio/light/lm3533-als.c b/drivers/iio/light/lm3533-als.c
index e45712a921ce..7503012ce933 100644
--- a/drivers/iio/light/lm3533-als.c
+++ b/drivers/iio/light/lm3533-als.c
@@ -718,8 +718,7 @@ static struct attribute_group lm3533_als_attribute_group = {
         .attrs = lm3533_als_attributes
 };
 
-static int __devinit lm3533_als_set_input_mode(struct lm3533_als *als,
-                                                                bool pwm_mode)
+static int lm3533_als_set_input_mode(struct lm3533_als *als, bool pwm_mode)
 {
         u8 mask = LM3533_ALS_INPUT_MODE_MASK;
         u8 val;
@@ -740,7 +739,7 @@ static int __devinit lm3533_als_set_input_mode(struct lm3533_als *als,
         return 0;
 }
 
-static int __devinit lm3533_als_set_resistor(struct lm3533_als *als, u8 val)
+static int lm3533_als_set_resistor(struct lm3533_als *als, u8 val)
 {
         int ret;
 
@@ -756,8 +755,8 @@ static int __devinit lm3533_als_set_resistor(struct lm3533_als *als, u8 val)
         return 0;
 }
 
-static int __devinit lm3533_als_setup(struct lm3533_als *als,
-                                        struct lm3533_als_platform_data *pdata)
+static int lm3533_als_setup(struct lm3533_als *als,
+                            struct lm3533_als_platform_data *pdata)
 {
         int ret;
 
@@ -775,7 +774,7 @@ static int __devinit lm3533_als_setup(struct lm3533_als *als,
         return 0;
 }
 
-static int __devinit lm3533_als_setup_irq(struct lm3533_als *als, void *dev)
+static int lm3533_als_setup_irq(struct lm3533_als *als, void *dev)
 {
         u8 mask = LM3533_ALS_INT_ENABLE_MASK;
         int ret;
@@ -799,7 +798,7 @@ static int __devinit lm3533_als_setup_irq(struct lm3533_als *als, void *dev)
         return 0;
 }
 
-static int __devinit lm3533_als_enable(struct lm3533_als *als)
+static int lm3533_als_enable(struct lm3533_als *als)
 {
         u8 mask = LM3533_ALS_ENABLE_MASK;
         int ret;
@@ -830,7 +829,7 @@ static const struct iio_info lm3533_als_info = {
         .read_raw       = &lm3533_als_read_raw,
 };
 
-static int __devinit lm3533_als_probe(struct platform_device *pdev)
+static int lm3533_als_probe(struct platform_device *pdev)
 {
         struct lm3533 *lm3533;
         struct lm3533_als_platform_data *pdata;
@@ -901,7 +900,7 @@ err_free_dev:
         return ret;
 }
 
-static int __devexit lm3533_als_remove(struct platform_device *pdev)
+static int lm3533_als_remove(struct platform_device *pdev)
 {
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
         struct lm3533_als *als = iio_priv(indio_dev);
@@ -922,7 +921,7 @@ static struct platform_driver lm3533_als_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = lm3533_als_probe,
-        .remove         = __devexit_p(lm3533_als_remove),
+        .remove         = lm3533_als_remove,
 };
 module_platform_driver(lm3533_als_driver);
 
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index e49cb9784a6f..2aa748fbdc0e 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -150,8 +150,8 @@ static const struct iio_info vcnl4000_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit vcnl4000_probe(struct i2c_client *client,
-                                        const struct i2c_device_id *id)
+static int vcnl4000_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
 {
         struct vcnl4000_data *data;
         struct iio_dev *indio_dev;
@@ -190,7 +190,7 @@ error_free_dev:
         return ret;
 }
 
-static int __devexit vcnl4000_remove(struct i2c_client *client)
+static int vcnl4000_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -206,7 +206,7 @@ static struct i2c_driver vcnl4000_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = vcnl4000_probe,
-        .remove = __devexit_p(vcnl4000_remove),
+        .remove = vcnl4000_remove,
         .id_table = vcnl4000_id,
 };
 
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index 28026e2ab06b..d8d01265220b 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -278,7 +278,7 @@ static int magn_3d_parse_report(struct platform_device *pdev,
 }
 
 /* Function to initialize the processing for usage id */
-static int __devinit hid_magn_3d_probe(struct platform_device *pdev)
+static int hid_magn_3d_probe(struct platform_device *pdev)
 {
         int ret = 0;
         static char *name = "magn_3d";
@@ -375,7 +375,7 @@ error_ret:
 }
 
 /* Function to deinitialize the processing for usage id */
-static int __devinit hid_magn_3d_remove(struct platform_device *pdev)
+static int hid_magn_3d_remove(struct platform_device *pdev)
 {
         struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);