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

Commit 6a88fa48 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron
Browse files

staging: iio: ad799x_core: 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 e5bf4f5b

drivers/staging/iio/adc/ad799x_core.c

+5 −11
Original line number Diff line number Diff line
@@ -586,8 +586,9 @@ static int ad799x_probe(struct i2c_client *client, 
	int ret;

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

	struct ad799x_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;
@@ -606,11 +607,11 @@ static int ad799x_probe(struct i2c_client *client, 


	st->int_vref_mv = pdata->vref_mv;



	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;

	}

	st->client = client;
@@ -650,10 +651,6 @@ static int ad799x_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;

}
@@ -668,12 +665,9 @@ static int ad799x_remove(struct i2c_client *client) 
		free_irq(client->irq, indio_dev);



	ad799x_ring_cleanup(indio_dev);

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

	if (!IS_ERR(st->reg))

		regulator_disable(st->reg);

		regulator_put(st->reg);

	}

	kfree(st->rx_buf);

	iio_device_free(indio_dev);



	return 0;

}