From: Jonathan Cameron <jic23@kernel.org>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: lars@metafoo.de, ardeleanalex@gmail.com,
andy.shevchenko@gmail.com, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v3] iio: adc128s052: Simplify 'adc128_probe()'
Date: Wed, 20 Oct 2021 17:42:44 +0100 [thread overview]
Message-ID: <20211020174244.4b6a9206@jic23-huawei> (raw)
In-Reply-To: <a9e71dfa-8ecc-aa0d-7e02-bcc6003ae896@wanadoo.fr>
On Wed, 13 Oct 2021 22:07:25 +0200
Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> Le 29/08/2021 à 19:16, Jonathan Cameron a écrit :
> > On Thu, 26 Aug 2021 20:36:22 +0200
> > Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> >
> >> Turn 'adc128_probe()' into a full resource managed function to simplify the
> >> code.
> >>
> >> This way, the .remove function can be removed.
> >> Doing so, the only 'spi_get_drvdata()' call is removed and the
> >> corresponding 'spi_set_drvdata()' can be removed as well.
> >>
> >> Suggested-by: Alexandru Ardelean <ardeleanalex@gmail.com>
> >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> >> Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
> > Looks good to me, but as mentioned this will need to wait for the
> > fix to go upstream.
> >
> > Give me a poke if I seem to have lost it once that's true.
>
> Hi,
>
> looks like it's fine now. So this is a gentle reminder :)
> The fix is in -next (see [1])
>
> CJ
>
> [1]:
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/drivers/iio/adc/ti-adc128s052.c
Applied to the togreg branch of iio.git and pushed out as testing for
0-day to see if we missed anything.
Thanks,
Jonathan
>
> >
> > Thanks,
> >
> > Jonathan
> >
> >> ---
> >> Compile tested only.
> >>
> >> When reviewing, pay special attention to the 'spi_set_drvdata()' call
> >> removal. I recently introduced a regression with a too aggressive cleanup
> >> like that.
> >>
> >> This patch should be applied after
> >> https://lore.kernel.org/linux-iio/f33069f0-601b-4bbb-3766-026f7a161912-39ZsbGIQGT5GWvitb5QawA@public.gmane.org/T/#meb792dcd6540f87d9ae041660ca4738a776e924a
> >>
> >> v1 --> v2: just garbage --> ignore
> >> v1 --> v3: Simplify 'adc128_disable_regulator()'
> >> ---
> >> drivers/iio/adc/ti-adc128s052.c | 26 +++++++++-----------------
> >> 1 file changed, 9 insertions(+), 17 deletions(-)
> >>
> >> diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c
> >> index 3143f35a6509..ce0cfe40b219 100644
> >> --- a/drivers/iio/adc/ti-adc128s052.c
> >> +++ b/drivers/iio/adc/ti-adc128s052.c
> >> @@ -132,6 +132,11 @@ static const struct iio_info adc128_info = {
> >> .read_raw = adc128_read_raw,
> >> };
> >>
> >> +static void adc128_disable_regulator(void *reg)
> >> +{
> >> + regulator_disable(reg);
> >> +}
> >> +
> >> static int adc128_probe(struct spi_device *spi)
> >> {
> >> struct iio_dev *indio_dev;
> >> @@ -151,8 +156,6 @@ static int adc128_probe(struct spi_device *spi)
> >> adc = iio_priv(indio_dev);
> >> adc->spi = spi;
> >>
> >> - spi_set_drvdata(spi, indio_dev);
> >> -
> >> indio_dev->name = spi_get_device_id(spi)->name;
> >> indio_dev->modes = INDIO_DIRECT_MODE;
> >> indio_dev->info = &adc128_info;
> >> @@ -167,23 +170,13 @@ static int adc128_probe(struct spi_device *spi)
> >> ret = regulator_enable(adc->reg);
> >> if (ret < 0)
> >> return ret;
> >> + ret = devm_add_action_or_reset(&spi->dev, adc128_disable_regulator, adc->reg);
> >> + if (ret)
> >> + return ret;
> >>
> >> mutex_init(&adc->lock);
> >>
> >> - ret = iio_device_register(indio_dev);
> >> -
> >> - return ret;
> >> -}
> >> -
> >> -static int adc128_remove(struct spi_device *spi)
> >> -{
> >> - struct iio_dev *indio_dev = spi_get_drvdata(spi);
> >> - struct adc128 *adc = iio_priv(indio_dev);
> >> -
> >> - iio_device_unregister(indio_dev);
> >> - regulator_disable(adc->reg);
> >> -
> >> - return 0;
> >> + return devm_iio_device_register(&spi->dev, indio_dev);
> >> }
> >>
> >> static const struct of_device_id adc128_of_match[] = {
> >> @@ -225,7 +218,6 @@ static struct spi_driver adc128_driver = {
> >> .acpi_match_table = ACPI_PTR(adc128_acpi_match),
> >> },
> >> .probe = adc128_probe,
> >> - .remove = adc128_remove,
> >> .id_table = adc128_id,
> >> };
> >> module_spi_driver(adc128_driver);
> >
> >
>
prev parent reply other threads:[~2021-10-20 16:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 18:36 [PATCH v3] iio: adc128s052: Simplify 'adc128_probe()' Christophe JAILLET
2021-08-29 17:16 ` Jonathan Cameron
2021-10-13 20:07 ` Christophe JAILLET
2021-10-20 16:42 ` Jonathan Cameron [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211020174244.4b6a9206@jic23-huawei \
--to=jic23@kernel.org \
--cc=andy.shevchenko@gmail.com \
--cc=ardeleanalex@gmail.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).