]> Pileus Git - ~andy/linux/commitdiff
iio: adc: ti-adc081c: Use devm_* APIs
authorSachin Kamat <sachin.kamat@linaro.org>
Tue, 23 Jul 2013 08:58:00 +0000 (09:58 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sat, 3 Aug 2013 17:40:42 +0000 (18:40 +0100)
devm_* APIs are device managed and make code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/adc/ti-adc081c.c

index 2826faae706c11a85f76aa8afa2586bfacf8238c..ee5f72bffe5a8f993276d480ba5a65e685ada659 100644 (file)
@@ -74,22 +74,20 @@ static int adc081c_probe(struct i2c_client *client,
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA))
                return -ENODEV;
 
-       iio = iio_device_alloc(sizeof(*adc));
+       iio = devm_iio_device_alloc(&client->dev, sizeof(*adc));
        if (!iio)
                return -ENOMEM;
 
        adc = iio_priv(iio);
        adc->i2c = client;
 
-       adc->ref = regulator_get(&client->dev, "vref");
-       if (IS_ERR(adc->ref)) {
-               err = PTR_ERR(adc->ref);
-               goto iio_free;
-       }
+       adc->ref = devm_regulator_get(&client->dev, "vref");
+       if (IS_ERR(adc->ref))
+               return PTR_ERR(adc->ref);
 
        err = regulator_enable(adc->ref);
        if (err < 0)
-               goto regulator_put;
+               return err;
 
        iio->dev.parent = &client->dev;
        iio->name = dev_name(&client->dev);
@@ -109,10 +107,6 @@ static int adc081c_probe(struct i2c_client *client,
 
 regulator_disable:
        regulator_disable(adc->ref);
-regulator_put:
-       regulator_put(adc->ref);
-iio_free:
-       iio_device_free(iio);
 
        return err;
 }
@@ -124,8 +118,6 @@ static int adc081c_remove(struct i2c_client *client)
 
        iio_device_unregister(iio);
        regulator_disable(adc->ref);
-       regulator_put(adc->ref);
-       iio_device_free(iio);
 
        return 0;
 }