evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: iio: ad5933: Use devm_* APIs

Browse source 
devm_* APIs are device managed and make code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Sachin Kamat 2013-09-05 10:29:00 +01:00 • committed by Jonathan Cameron
parent 7af9648fbc
commit 53703a4933
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/staging/iio/impedance-analyzer/ad5933.c
View file

@ -703,7 +703,9 @@ static int ad5933_probe(struct i2c_client *client,
int ret, voltage_uv = 0; int ret, voltage_uv = 0;
struct ad5933_platform_data *pdata = client->dev.platform_data; struct ad5933_platform_data *pdata = client->dev.platform_data;
struct ad5933_state *st; struct ad5933_state *st;
struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st)); struct iio_dev *indio_dev;
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st));
if (indio_dev == NULL) if (indio_dev == NULL)
return -ENOMEM; return -ENOMEM;
@ -716,11 +718,11 @@ static int ad5933_probe(struct i2c_client *client,
else else
st->pdata = pdata; st->pdata = pdata;
st->reg = regulator_get(&client->dev, "vcc"); st->reg = devm_regulator_get(&client->dev, "vcc");
if (!IS_ERR(st->reg)) { if (!IS_ERR(st->reg)) {
ret = regulator_enable(st->reg); ret = regulator_enable(st->reg);
if (ret) if (ret)
goto error_put_reg; return ret;
voltage_uv = regulator_get_voltage(st->reg); voltage_uv = regulator_get_voltage(st->reg);
} }
@ -778,11 +780,6 @@ error_unreg_ring:
error_disable_reg: error_disable_reg:
if (!IS_ERR(st->reg)) if (!IS_ERR(st->reg))
regulator_disable(st->reg); regulator_disable(st->reg);
error_put_reg:
if (!IS_ERR(st->reg))
regulator_put(st->reg);
iio_device_free(indio_dev);
return ret; return ret;
} }
@ -795,11 +792,8 @@ static int ad5933_remove(struct i2c_client *client)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
iio_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
iio_kfifo_free(indio_dev->buffer); iio_kfifo_free(indio_dev->buffer);
if (!IS_ERR(st->reg)) { if (!IS_ERR(st->reg))
regulator_disable(st->reg); regulator_disable(st->reg);
regulator_put(st->reg);
}
iio_device_free(indio_dev);
return 0; return 0;
} }