linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
	<linux-kernel@vger.kernel.org>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 2/4] clocksource/drivers/sp804: Use clk_prepare_enable and clk_disable_unprepare
Date: Thu, 29 Oct 2020 20:33:15 +0800	[thread overview]
Message-ID: <20201029123317.90286-3-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20201029123317.90286-1-wangkefeng.wang@huawei.com>

Directly use clk_prepare_enable and clk_disable_unprepare.

Signed-off-by: Kefeng Wang <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 43d31bf09a18..9e0cc029b06a 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.26.2


  parent reply	other threads:[~2020-10-29 12:27 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-29 12:33 [PATCH 0/4] clocksource/drivers/sp804: misc cleanup Kefeng Wang
2020-10-29 12:33 ` [PATCH 1/4] clocksource/drivers/sp804: Make some symbol static Kefeng Wang
2020-12-03 23:47   ` [tip: timers/core] " tip-bot2 for Kefeng Wang
2020-10-29 12:33 ` Kefeng Wang [this message]
2020-12-03 23:47   ` [tip: timers/core] clocksource/drivers/sp804: Use clk_prepare_enable and clk_disable_unprepare tip-bot2 for Kefeng Wang
2020-10-29 12:33 ` [PATCH 3/4] clocksource/drivers/sp804: Correct clk_get_rate handle Kefeng Wang
2020-12-03 23:47   ` [tip: timers/core] " tip-bot2 for Kefeng Wang
2020-10-29 12:33 ` [PATCH 4/4] clocksource/drivers/sp804: Use pr_fmt Kefeng Wang
2020-12-03 23:47   ` [tip: timers/core] " tip-bot2 for Kefeng Wang

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=20201029123317.90286-3-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=daniel.lezcano@linaro.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).