Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / iio / frequency / ad9834.c

diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
index 5cba3c01f41720f57148bfe994263b17e18f71e9..86cda617609330d6183bbaea05bae90f4599b152 100644 (file)
--- a/drivers/staging/iio/frequency/ad9834.c
+++ b/drivers/staging/iio/frequency/ad9834.c
@@ -70,9 +70,9 @@ static ssize_t ad9834_write(struct device *dev,
        struct ad9834_state *st = iio_priv(indio_dev);
        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
        int ret;
-       long val;
+       unsigned long val;
 
-       ret = strict_strtoul(buf, 10, &val);
+       ret = kstrtoul(buf, 10, &val);
        if (ret)
                goto error_ret;
 
@@ -327,14 +327,14 @@ static int ad9834_probe(struct spi_device *spi)
                return -ENODEV;
        }
 
-       reg = regulator_get(&spi->dev, "vcc");
+       reg = devm_regulator_get(&spi->dev, "vcc");
        if (!IS_ERR(reg)) {
                ret = regulator_enable(reg);
                if (ret)
-                       goto error_put_reg;
+                       return ret;
        }
 
-       indio_dev = iio_device_alloc(sizeof(*st));
+       indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
        if (indio_dev == NULL) {
                ret = -ENOMEM;
                goto error_disable_reg;
@@ -388,39 +388,35 @@ static int ad9834_probe(struct spi_device *spi)
        ret = spi_sync(st->spi, &st->msg);
        if (ret) {
                dev_err(&spi->dev, "device init failed\n");
-               goto error_free_device;
+               goto error_disable_reg;
        }
 
        ret = ad9834_write_frequency(st, AD9834_REG_FREQ0, pdata->freq0);
        if (ret)
-               goto error_free_device;
+               goto error_disable_reg;
 
        ret = ad9834_write_frequency(st, AD9834_REG_FREQ1, pdata->freq1);
        if (ret)
-               goto error_free_device;
+               goto error_disable_reg;
 
        ret = ad9834_write_phase(st, AD9834_REG_PHASE0, pdata->phase0);
        if (ret)
-               goto error_free_device;
+               goto error_disable_reg;
 
        ret = ad9834_write_phase(st, AD9834_REG_PHASE1, pdata->phase1);
        if (ret)
-               goto error_free_device;
+               goto error_disable_reg;
 
        ret = iio_device_register(indio_dev);
        if (ret)
-               goto error_free_device;
+               goto error_disable_reg;
 
        return 0;
 
-error_free_device:
-       iio_device_free(indio_dev);
 error_disable_reg:
        if (!IS_ERR(reg))
                regulator_disable(reg);
-error_put_reg:
-       if (!IS_ERR(reg))
-               regulator_put(reg);
+
        return ret;
 }
 
@@ -430,11 +426,8 @@ static int ad9834_remove(struct spi_device *spi)
        struct ad9834_state *st = iio_priv(indio_dev);
 
        iio_device_unregister(indio_dev);
-       if (!IS_ERR(st->reg)) {
+       if (!IS_ERR(st->reg))
                regulator_disable(st->reg);
-               regulator_put(st->reg);
-       }
-       iio_device_free(indio_dev);
 
        return 0;
 }