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>

10 files changed, 77 insertions, 35 deletions

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