Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53703a49 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron
Browse files

staging: iio: ad5933: Use devm_* APIs 



devm_* APIs are device managed and make code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 7af9648f

drivers/staging/iio/impedance-analyzer/ad5933.c

+6 −12
Original line number Diff line number Diff line
@@ -703,7 +703,9 @@ static int ad5933_probe(struct i2c_client *client, 
	int ret, voltage_uv = 0;

	struct ad5933_platform_data *pdata = client->dev.platform_data;

	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)

		return -ENOMEM;
@@ -716,11 +718,11 @@ static int ad5933_probe(struct i2c_client *client, 
	else

		st->pdata = pdata;



	st->reg = regulator_get(&client->dev, "vcc");

	st->reg = devm_regulator_get(&client->dev, "vcc");

	if (!IS_ERR(st->reg)) {

		ret = regulator_enable(st->reg);

		if (ret)

			goto error_put_reg;

			return ret;

		voltage_uv = regulator_get_voltage(st->reg);

	}
@@ -778,11 +780,6 @@ static int ad5933_probe(struct i2c_client *client, 
error_disable_reg:

	if (!IS_ERR(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;

}
@@ -795,11 +792,8 @@ static int ad5933_remove(struct i2c_client *client) 
	iio_device_unregister(indio_dev);

	iio_buffer_unregister(indio_dev);

	iio_kfifo_free(indio_dev->buffer);

	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;

}