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: cadence: Use devm_clk_get_enabled() helper
Date: Sat, 31 Dec 2022 11:29:30 -0800 [thread overview]
Message-ID: <20221231192930.GD3434944@roeck-us.net> (raw)
In-Reply-To: <615c6c3c46c3ee8e3136725af0ab0b51e1298091.1672474336.git.christophe.jaillet@wanadoo.fr>
On Sat, Dec 31, 2022 at 09:12:28AM +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>
> ---
> drivers/watchdog/cadence_wdt.c | 17 +----------------
> 1 file changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c
> index bc99e9164930..23d41043863f 100644
> --- a/drivers/watchdog/cadence_wdt.c
> +++ b/drivers/watchdog/cadence_wdt.c
> @@ -274,11 +274,6 @@ static const struct watchdog_ops cdns_wdt_ops = {
> .set_timeout = cdns_wdt_settimeout,
> };
>
> -static void cdns_clk_disable_unprepare(void *data)
> -{
> - clk_disable_unprepare(data);
> -}
> -
> /************************Platform Operations*****************************/
> /**
> * cdns_wdt_probe - Probe call for the device.
> @@ -333,21 +328,11 @@ static int cdns_wdt_probe(struct platform_device *pdev)
> watchdog_stop_on_reboot(cdns_wdt_device);
> watchdog_set_drvdata(cdns_wdt_device, wdt);
>
> - wdt->clk = devm_clk_get(dev, NULL);
> + wdt->clk = devm_clk_get_enabled(dev, NULL);
> if (IS_ERR(wdt->clk))
> return dev_err_probe(dev, PTR_ERR(wdt->clk),
> "input clock not found\n");
>
> - ret = clk_prepare_enable(wdt->clk);
> - if (ret) {
> - dev_err(dev, "unable to enable clock\n");
> - return ret;
> - }
> - ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare,
> - wdt->clk);
> - if (ret)
> - return ret;
> -
> clock_f = clk_get_rate(wdt->clk);
> if (clock_f <= CDNS_WDT_CLK_75MHZ) {
> wdt->prescaler = CDNS_WDT_PRESCALE_512;
> --
> 2.34.1
>
prev parent reply other threads:[~2022-12-31 19:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-31 8:12 [PATCH] watchdog: cadence: Use devm_clk_get_enabled() helper Christophe JAILLET
2022-12-31 19:29 ` 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=20221231192930.GD3434944@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).