iio: adc: ti-adc081c: Use devm_* APIs

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>
This commit is contained in:
Sachin Kamat 2013-07-23 09:58:00 +01:00 committed by Jonathan Cameron
parent ed6886c104
commit 99e94b6d56
1 changed files with 5 additions and 13 deletions

View File

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