From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 03/13] clocksource/drivers/sp804: Use clk_prepare_enable and clk_disable_unprepare
Date: Thu, 3 Dec 2020 20:32:51 +0100 [thread overview]
Message-ID: <20201203193301.2405835-3-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20201203193301.2405835-1-daniel.lezcano@linaro.org>
From: Kefeng Wang <wangkefeng.wang@huawei.com>
Directly use clk_prepare_enable and clk_disable_unprepare.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201029123317.90286-3-wangkefeng.wang@huawei.com
---
drivers/clocksource/timer-sp804.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
index 22a68cb83cf3..d74788b47802 100644
--- a/drivers/clocksource/timer-sp804.c
+++ b/drivers/clocksource/timer-sp804.c
@@ -68,17 +68,9 @@ static long __init sp804_get_clock_rate(struct clk *clk, const char *name)
return PTR_ERR(clk);
}
- err = clk_prepare(clk);
- if (err) {
- pr_err("sp804: clock failed to prepare: %d\n", err);
- clk_put(clk);
- return err;
- }
-
- err = clk_enable(clk);
+ err = clk_prepare_enable(clk);
if (err) {
pr_err("sp804: clock failed to enable: %d\n", err);
- clk_unprepare(clk);
clk_put(clk);
return err;
}
@@ -86,8 +78,7 @@ static long __init sp804_get_clock_rate(struct clk *clk, const char *name)
rate = clk_get_rate(clk);
if (rate < 0) {
pr_err("sp804: clock failed to get rate: %ld\n", rate);
- clk_disable(clk);
- clk_unprepare(clk);
+ clk_disable_unprepare(clk);
clk_put(clk);
}
--
2.25.1
next prev parent reply other threads:[~2020-12-03 19:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 19:23 [GIT PULL] timer drivers for v5.11 Daniel Lezcano
2020-12-03 19:32 ` [PATCH 01/13] clocksource/drivers/sp804: Add static for functions such as sp804_clockevents_init() Daniel Lezcano
2020-12-03 19:32 ` [PATCH 02/13] clocksource/drivers/sp804: Make some symbol static Daniel Lezcano
2020-12-03 19:32 ` Daniel Lezcano [this message]
2020-12-03 19:32 ` [PATCH 04/13] clocksource/drivers/sp804: Correct clk_get_rate handle Daniel Lezcano
2020-12-03 19:32 ` [PATCH 05/13] clocksource/drivers/sp804: Use pr_fmt Daniel Lezcano
2020-12-03 19:32 ` [PATCH 06/13] dt-bindings: timer: Add new OST support for the upcoming new driver Daniel Lezcano
2020-12-03 19:32 ` [PATCH 07/13] clocksource/drivers/nps: Remove EZChip NPS clocksource driver Daniel Lezcano
2020-12-03 19:32 ` [PATCH 08/13] clocksource/drivers/orion: Add missing clk_disable_unprepare() on error path Daniel Lezcano
2020-12-03 19:32 ` [PATCH 09/13] dt-bindings: timer: renesas: tmu: Document r8a774e1 bindings Daniel Lezcano
2020-12-03 19:32 ` [PATCH 10/13] dt-bindings: timer: renesas: tmu: Convert to json-schema Daniel Lezcano
2020-12-03 19:32 ` [PATCH 11/13] clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() Daniel Lezcano
2020-12-03 19:33 ` [PATCH 12/13] clocksource/drivers/ingenic: Fix section mismatch Daniel Lezcano
2020-12-03 19:33 ` [PATCH 13/13] clocksource/drivers/riscv: Make RISCV_TIMER depends on RISCV_SBI Daniel Lezcano
2020-12-03 23:41 ` [GIT PULL] timer drivers for v5.11 Thomas Gleixner
2020-12-03 23:47 ` [tip: timers/core] Merge tag 'timers-v5.11' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core tip-bot2 for Thomas Gleixner
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=20201203193301.2405835-3-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/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).