iio: amplifiers: ad8366: Use devm_* APIs
devm_* APIs are device managed and make code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Michael Hennerich <hennerich@blackfin.uclinux.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Родитель
1003eb67ba
Коммит
36db8c7216
|
@ -139,17 +139,17 @@ static int ad8366_probe(struct spi_device *spi)
|
||||||
struct ad8366_state *st;
|
struct ad8366_state *st;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
indio_dev = iio_device_alloc(sizeof(*st));
|
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
|
||||||
if (indio_dev == NULL)
|
if (indio_dev == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
st = iio_priv(indio_dev);
|
st = iio_priv(indio_dev);
|
||||||
|
|
||||||
st->reg = regulator_get(&spi->dev, "vcc");
|
st->reg = devm_regulator_get(&spi->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;
|
||||||
}
|
}
|
||||||
|
|
||||||
spi_set_drvdata(spi, indio_dev);
|
spi_set_drvdata(spi, indio_dev);
|
||||||
|
@ -173,11 +173,6 @@ static int ad8366_probe(struct spi_device *spi)
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
@ -195,8 +190,6 @@ static int ad8366_remove(struct spi_device *spi)
|
||||||
regulator_put(reg);
|
regulator_put(reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
iio_device_free(indio_dev);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче