drivers/iio/adc/at91_adc.c: use devm_ functions

[deliverable/linux.git] / drivers / iio / adc / at91_adc.c

diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index f18a95d802551fc029f51b33037e83a2185a7f79..98c96f90c88b10168e6a5f72049730b6b337af93 100644 (file)
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -26,9 +26,9 @@
 
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
-#include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger.h>
 #include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
 
 #include <mach/at91_adc.h>
 
@@ -318,58 +318,15 @@ static void at91_adc_trigger_remove(struct iio_dev *idev)
        }
 }
 
-static const struct iio_buffer_setup_ops at91_adc_buffer_ops = {
-       .preenable = &iio_sw_buffer_preenable,
-       .postenable = &iio_triggered_buffer_postenable,
-       .predisable = &iio_triggered_buffer_predisable,
-};
-
 static int at91_adc_buffer_init(struct iio_dev *idev)
 {
-       int ret;
-
-       idev->buffer = iio_kfifo_allocate(idev);
-       if (!idev->buffer) {
-               ret = -ENOMEM;
-               goto error_ret;
-       }
-
-       idev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
-                                           &at91_adc_trigger_handler,
-                                           IRQF_ONESHOT,
-                                           idev,
-                                           "%s-consumer%d",
-                                           idev->name,
-                                           idev->id);
-       if (idev->pollfunc == NULL) {
-               ret = -ENOMEM;
-               goto error_pollfunc;
-       }
-
-       idev->setup_ops = &at91_adc_buffer_ops;
-       idev->modes |= INDIO_BUFFER_TRIGGERED;
-
-       ret = iio_buffer_register(idev,
-                                 idev->channels,
-                                 idev->num_channels);
-       if (ret)
-               goto error_register;
-
-       return 0;
-
-error_register:
-       iio_dealloc_pollfunc(idev->pollfunc);
-error_pollfunc:
-       iio_kfifo_free(idev->buffer);
-error_ret:
-       return ret;
+       return iio_triggered_buffer_setup(idev, &iio_pollfunc_store_time,
+               &at91_adc_trigger_handler, NULL);
 }
 
 static void at91_adc_buffer_remove(struct iio_dev *idev)
 {
-       iio_buffer_unregister(idev);
-       iio_dealloc_pollfunc(idev->pollfunc);
-       iio_kfifo_free(idev->buffer);
+       iio_triggered_buffer_cleanup(idev);
 }
 
 static int at91_adc_read_raw(struct iio_dev *idev,
@@ -392,9 +349,11 @@ static int at91_adc_read_raw(struct iio_dev *idev,
                                                       st->done,
                                                       msecs_to_jiffies(1000));
                if (ret == 0)
-                       return -ETIMEDOUT;
-               else if (ret < 0)
+                       ret = -ETIMEDOUT;
+               if (ret < 0) {
+                       mutex_unlock(&st->lock);
                        return ret;
+               }
 
                *val = st->last_value;
 
@@ -586,13 +545,6 @@ static int __devinit at91_adc_probe(struct platform_device *pdev)
                goto error_free_device;
        }
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "No resource defined\n");
-               ret = -ENXIO;
-               goto error_ret;
-       }
-
        platform_set_drvdata(pdev, idev);
 
        idev->dev.parent = &pdev->dev;
@@ -607,18 +559,12 @@ static int __devinit at91_adc_probe(struct platform_device *pdev)
                goto error_free_device;
        }
 
-       if (!request_mem_region(res->start, resource_size(res),
-                               "AT91 adc registers")) {
-               dev_err(&pdev->dev, "Resources are unavailable.\n");
-               ret = -EBUSY;
-               goto error_free_device;
-       }
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       st->reg_base = ioremap(res->start, resource_size(res));
+       st->reg_base = devm_request_and_ioremap(&pdev->dev, res);
        if (!st->reg_base) {
-               dev_err(&pdev->dev, "Failed to map registers.\n");
                ret = -ENOMEM;
-               goto error_release_mem;
+               goto error_free_device;
        }
 
        /*
@@ -633,10 +579,10 @@ static int __devinit at91_adc_probe(struct platform_device *pdev)
                          idev);
        if (ret) {
                dev_err(&pdev->dev, "Failed to allocate IRQ.\n");
-               goto error_unmap_reg;
+               goto error_free_device;
        }
 
-       st->clk = clk_get(&pdev->dev, "adc_clk");
+       st->clk = devm_clk_get(&pdev->dev, "adc_clk");
        if (IS_ERR(st->clk)) {
                dev_err(&pdev->dev, "Failed to get the clock.\n");
                ret = PTR_ERR(st->clk);
@@ -646,7 +592,7 @@ static int __devinit at91_adc_probe(struct platform_device *pdev)
        ret = clk_prepare(st->clk);
        if (ret) {
                dev_err(&pdev->dev, "Could not prepare the clock.\n");
-               goto error_free_clk;
+               goto error_free_irq;
        }
 
        ret = clk_enable(st->clk);
@@ -655,7 +601,7 @@ static int __devinit at91_adc_probe(struct platform_device *pdev)
                goto error_unprepare_clk;
        }
 
-       st->adc_clk = clk_get(&pdev->dev, "adc_op_clk");
+       st->adc_clk = devm_clk_get(&pdev->dev, "adc_op_clk");
        if (IS_ERR(st->adc_clk)) {
                dev_err(&pdev->dev, "Failed to get the ADC clock.\n");
                ret = PTR_ERR(st->clk);
@@ -665,7 +611,7 @@ static int __devinit at91_adc_probe(struct platform_device *pdev)
        ret = clk_prepare(st->adc_clk);
        if (ret) {
                dev_err(&pdev->dev, "Could not prepare the ADC clock.\n");
-               goto error_free_adc_clk;
+               goto error_disable_clk;
        }
 
        ret = clk_enable(st->adc_clk);
@@ -738,20 +684,12 @@ error_disable_adc_clk:
        clk_disable(st->adc_clk);
 error_unprepare_adc_clk:
        clk_unprepare(st->adc_clk);
-error_free_adc_clk:
-       clk_put(st->adc_clk);
 error_disable_clk:
        clk_disable(st->clk);
 error_unprepare_clk:
        clk_unprepare(st->clk);
-error_free_clk:
-       clk_put(st->clk);
 error_free_irq:
        free_irq(st->irq, idev);
-error_unmap_reg:
-       iounmap(st->reg_base);
-error_release_mem:
-       release_mem_region(res->start, resource_size(res));
 error_free_device:
        iio_device_free(idev);
 error_ret:
@@ -761,20 +699,15 @@ error_ret:
 static int __devexit at91_adc_remove(struct platform_device *pdev)
 {
        struct iio_dev *idev = platform_get_drvdata(pdev);
-       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        struct at91_adc_state *st = iio_priv(idev);
 
        iio_device_unregister(idev);
        at91_adc_trigger_remove(idev);
        at91_adc_buffer_remove(idev);
        clk_disable_unprepare(st->adc_clk);
-       clk_put(st->adc_clk);
        clk_disable(st->clk);
        clk_unprepare(st->clk);
-       clk_put(st->clk);
        free_irq(st->irq, idev);
-       iounmap(st->reg_base);
-       release_mem_region(res->start, resource_size(res));
        iio_device_free(idev);
 
        return 0;