From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Alexandru Ardelean <ardeleanalex@gmail.com>
Cc: Jonathan Cameron <jic23@kernel.org>,
linux-iio <linux-iio@vger.kernel.org>,
Alexandru Tachici <alexandru.tachici@analog.com>
Subject: Re: [PATCH] iio: adc: ad7192: Avoid disabling a clock that was never enabled.
Date: Mon, 10 May 2021 12:56:39 +0100 [thread overview]
Message-ID: <20210510125639.00004fab@Huawei.com> (raw)
In-Reply-To: <CA+U=Dsp5T52yJ9rs1Ov4W9Lxs6mySGa9cndAiKMhEzh0K1-8oQ@mail.gmail.com>
On Mon, 10 May 2021 14:30:48 +0300
Alexandru Ardelean <ardeleanalex@gmail.com> wrote:
> On Sun, May 9, 2021 at 2:42 PM Jonathan Cameron <jic23@kernel.org> wrote:
> >
> > From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> >
> > Found by inspection.
> >
> > If the internal clock source is being used, the driver doesn't
> > call clk_prepare_enable() and as such we should not call
> > clk_disable_unprepare()
> >
> > Use the same condition to protect the disable path as is used
> > on the enable one. Note this will all get simplified when
> > the driver moves over to a full devm_ flow, but that would make
> > backporting the fix harder.
> >
> > Fix obviously predates move out of staging, but backporting will
> > become more complex (and is unlikely to happen), hence that patch
> > is given in the fixes tag.
> >
>
> This also looks like a conversion to devm_ would help.
> But later.
Absolutely. I decided to do a pre parse of likely targets for
devmification to see if we had fixed that needed to go first and
that's when I noticed this one.
That way we don't end up with the mess I caused in the previous
set where I have to remember to finally pick up the non fix
part after the fixes are in.
Jonathan
>
> Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
>
> > Fixes: b581f748cce0 ("staging: iio: adc: ad7192: move out of staging")
> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> > Cc: Alexandru Tachici <alexandru.tachici@analog.com>
> > Cc: Alexandru Ardelean <ardeleanalex@gmail.com>
> > ---
> > drivers/iio/adc/ad7192.c | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c
> > index 2ed580521d81..d3be67aa0522 100644
> > --- a/drivers/iio/adc/ad7192.c
> > +++ b/drivers/iio/adc/ad7192.c
> > @@ -1014,7 +1014,9 @@ static int ad7192_probe(struct spi_device *spi)
> > return 0;
> >
> > error_disable_clk:
> > - clk_disable_unprepare(st->mclk);
> > + if (st->clock_sel == AD7192_CLK_EXT_MCLK1_2 ||
> > + st->clock_sel == AD7192_CLK_EXT_MCLK2)
> > + clk_disable_unprepare(st->mclk);
> > error_remove_trigger:
> > ad_sd_cleanup_buffer_and_trigger(indio_dev);
> > error_disable_dvdd:
> > @@ -1031,7 +1033,9 @@ static int ad7192_remove(struct spi_device *spi)
> > struct ad7192_state *st = iio_priv(indio_dev);
> >
> > iio_device_unregister(indio_dev);
> > - clk_disable_unprepare(st->mclk);
> > + if (st->clock_sel == AD7192_CLK_EXT_MCLK1_2 ||
> > + st->clock_sel == AD7192_CLK_EXT_MCLK2)
> > + clk_disable_unprepare(st->mclk);
> > ad_sd_cleanup_buffer_and_trigger(indio_dev);
> >
> > regulator_disable(st->dvdd);
> > --
> > 2.31.1
> >
prev parent reply other threads:[~2021-05-10 13:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-09 11:41 [PATCH] iio: adc: ad7192: Avoid disabling a clock that was never enabled Jonathan Cameron
2021-05-10 11:30 ` Alexandru Ardelean
2021-05-10 11:56 ` 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=20210510125639.00004fab@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=alexandru.tachici@analog.com \
--cc=ardeleanalex@gmail.com \
--cc=jic23@kernel.org \
--cc=linux-iio@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).