From: Guenter Roeck <linux@roeck-us.net>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-watchdog@vger.kernel.org
Subject: Re: [PATCH] watchdog: imgpdc: Use devm_clk_get_enabled() helper
Date: Sat, 31 Dec 2022 15:09:40 -0800 [thread overview]
Message-ID: <20221231230940.GB2706156@roeck-us.net> (raw)
In-Reply-To: <1f8d1ce1e6a63c507a291aea624b1337326cc563.1672483996.git.christophe.jaillet@wanadoo.fr>
On Sat, Dec 31, 2022 at 11:53:34AM +0100, Christophe JAILLET wrote:
> The devm_clk_get_enabled() helper:
> - calls devm_clk_get()
> - calls clk_prepare_enable() and registers what is needed in order to
> call clk_disable_unprepare() when needed, as a managed resource.
>
> This simplifies the code and avoids the need of a dedicated function used
> with devm_add_action_or_reset().
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Note that the order of operations is slightly modified by this patch. The
> "sys" clk is now prepare_enable()'ed before clk_get("wdt").
> ---
> drivers/watchdog/imgpdc_wdt.c | 31 +++----------------------------
> 1 file changed, 3 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c
> index b57ff3787052..a55f801895d4 100644
> --- a/drivers/watchdog/imgpdc_wdt.c
> +++ b/drivers/watchdog/imgpdc_wdt.c
> @@ -175,16 +175,11 @@ static const struct watchdog_ops pdc_wdt_ops = {
> .restart = pdc_wdt_restart,
> };
>
> -static void pdc_clk_disable_unprepare(void *data)
> -{
> - clk_disable_unprepare(data);
> -}
> -
> static int pdc_wdt_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> u64 div;
> - int ret, val;
> + int val;
> unsigned long clk_rate;
> struct pdc_wdt_dev *pdc_wdt;
>
> @@ -196,38 +191,18 @@ static int pdc_wdt_probe(struct platform_device *pdev)
> if (IS_ERR(pdc_wdt->base))
> return PTR_ERR(pdc_wdt->base);
>
> - pdc_wdt->sys_clk = devm_clk_get(dev, "sys");
> + pdc_wdt->sys_clk = devm_clk_get_enabled(dev, "sys");
> if (IS_ERR(pdc_wdt->sys_clk)) {
> dev_err(dev, "failed to get the sys clock\n");
> return PTR_ERR(pdc_wdt->sys_clk);
> }
>
> - pdc_wdt->wdt_clk = devm_clk_get(dev, "wdt");
> + pdc_wdt->wdt_clk = devm_clk_get_enabled(dev, "wdt");
> if (IS_ERR(pdc_wdt->wdt_clk)) {
> dev_err(dev, "failed to get the wdt clock\n");
> return PTR_ERR(pdc_wdt->wdt_clk);
> }
>
> - ret = clk_prepare_enable(pdc_wdt->sys_clk);
> - if (ret) {
> - dev_err(dev, "could not prepare or enable sys clock\n");
> - return ret;
> - }
> - ret = devm_add_action_or_reset(dev, pdc_clk_disable_unprepare,
> - pdc_wdt->sys_clk);
> - if (ret)
> - return ret;
> -
> - ret = clk_prepare_enable(pdc_wdt->wdt_clk);
> - if (ret) {
> - dev_err(dev, "could not prepare or enable wdt clock\n");
> - return ret;
> - }
> - ret = devm_add_action_or_reset(dev, pdc_clk_disable_unprepare,
> - pdc_wdt->wdt_clk);
> - if (ret)
> - return ret;
> -
> /* We use the clock rate to calculate the max timeout */
> clk_rate = clk_get_rate(pdc_wdt->wdt_clk);
> if (clk_rate == 0) {
> --
> 2.34.1
>
prev parent reply other threads:[~2022-12-31 23:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-31 10:53 [PATCH] watchdog: imgpdc: Use devm_clk_get_enabled() helper Christophe JAILLET
2022-12-31 23:09 ` Guenter Roeck [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=20221231230940.GB2706156@roeck-us.net \
--to=linux@roeck-us.net \
--cc=christophe.jaillet@wanadoo.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@linux-watchdog.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).