From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from saturn.retrosnub.co.uk ([178.18.118.26]:53216 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751061Ab3HSSa5 (ORCPT ); Mon, 19 Aug 2013 14:30:57 -0400 Message-ID: <52127271.1070908@kernel.org> Date: Mon, 19 Aug 2013 20:30:57 +0100 From: Jonathan Cameron MIME-Version: 1.0 To: Sachin Kamat CC: linux-iio@vger.kernel.org, lars@metafoo.de, jic23@cam.ac.uk Subject: Re: [PATCH 09/14] iio: dac: ad5686: Use devm_* APIs References: <1376912305-6423-1-git-send-email-sachin.kamat@linaro.org> <1376912305-6423-9-git-send-email-sachin.kamat@linaro.org> In-Reply-To: <1376912305-6423-9-git-send-email-sachin.kamat@linaro.org> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 08/19/13 12:38, Sachin Kamat wrote: > devm_* APIs are device managed and make code simpler. > > Signed-off-by: Sachin Kamat Applied to the togreg branch of iio.git Thanks, Jonathan > --- > drivers/iio/dac/ad5686.c | 17 ++++------------- > 1 file changed, 4 insertions(+), 13 deletions(-) > > diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c > index 06439b1..57825ea 100644 > --- a/drivers/iio/dac/ad5686.c > +++ b/drivers/iio/dac/ad5686.c > @@ -314,18 +314,18 @@ static int ad5686_probe(struct spi_device *spi) > struct iio_dev *indio_dev; > int ret, regdone = 0, voltage_uv = 0; > > - indio_dev = iio_device_alloc(sizeof(*st)); > + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); > if (indio_dev == NULL) > return -ENOMEM; > > st = iio_priv(indio_dev); > spi_set_drvdata(spi, indio_dev); > > - st->reg = regulator_get(&spi->dev, "vcc"); > + st->reg = devm_regulator_get(&spi->dev, "vcc"); > if (!IS_ERR(st->reg)) { > ret = regulator_enable(st->reg); > if (ret) > - goto error_put_reg; > + return ret; > > ret = regulator_get_voltage(st->reg); > if (ret < 0) > @@ -369,12 +369,6 @@ static int ad5686_probe(struct spi_device *spi) > 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; > } > > @@ -384,11 +378,8 @@ static int ad5686_remove(struct spi_device *spi) > struct ad5686_state *st = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > - 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; > } >