public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 4/5] clocksource: h8300: Initializer cleanup.
Date: Sat,  5 Dec 2015 02:48:17 +0900	[thread overview]
Message-ID: <1449251298-29933-5-git-send-email-ysato@users.sourceforge.jp> (raw)
In-Reply-To: <1449251298-29933-1-git-send-email-ysato@users.sourceforge.jp>

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 drivers/clocksource/h8300_timer8.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c
index 1ba453b..9087dd2 100644
--- a/drivers/clocksource/h8300_timer8.c
+++ b/drivers/clocksource/h8300_timer8.c
@@ -33,7 +33,6 @@ struct timer8_priv {
 	void __iomem *mapbase;
 	unsigned long flags;
 	unsigned int rate;
-	unsigned int tcora;
 };
 
 static irqreturn_t timer8_interrupt(int irq, void *dev_id)
@@ -163,8 +162,6 @@ static void __init h8300_8timer_init(struct device_node *node)
 {
 	void __iomem *base;
 	int irq;
-	int ret = 0;
-	int rate;
 	struct clk *clk;
 
 	clk = of_clk_get(node, 0);
@@ -187,20 +184,20 @@ static void __init h8300_8timer_init(struct device_node *node)
 
 	timer8_priv.mapbase = base;
 
-	rate = clk_get_rate(clk) / SCALE;
-	if (!rate) {
+	timer8_priv.rate = clk_get_rate(clk) / SCALE;
+	if (!timer8_priv.rate) {
 		pr_err("Failed to get rate for the clocksource\n");
 		goto unmap_reg;
 	}
 
-	ret = request_irq(irq, timer8_interrupt,
-			  IRQF_TIMER, timer8_priv.ced.name, &timer8_priv);
-	if (ret < 0) {
+	if (request_irq(irq, timer8_interrupt, IRQF_TIMER,
+			timer8_priv.ced.name, &timer8_priv) < 0) {
 		pr_err("failed to request irq %d for clockevent\n", irq);
 		goto unmap_reg;
 	}
 
-	clockevents_config_and_register(&timer8_priv.ced, rate, 1, 0x0000ffff);
+	clockevents_config_and_register(&timer8_priv.ced,
+					timer8_priv.rate, 1, 0x0000ffff);
 
 	return;
 unmap_reg:
-- 
2.6.1


  parent reply	other threads:[~2015-12-04 17:49 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-04  5:56 [PATCH 0/5] clocksource: h8300: driver update Yoshinori Sato
2015-12-04  5:56 ` [PATCH 1/5] clocksource: h8300: Change to overflow interrupt Yoshinori Sato
2015-12-04  5:56 ` [PATCH 2/5] clocksource: h8300: Fix timer not overflow case Yoshinori Sato
2015-12-04  5:56 ` [PATCH 3/5] clocksource: h8300: Simplify delta handling Yoshinori Sato
2015-12-04  5:56 ` [PATCH 4/5] clocksource: h8300: Initializer cleanup Yoshinori Sato
2015-12-04  5:56 ` [PATCH 5/5] clocksource: h8300: Use ioread / iowrite Yoshinori Sato
2015-12-04 14:38   ` kbuild test robot
2015-12-04 17:48 ` [PATCH v2 0/5] h8300 clocksource update Yoshinori Sato
2015-12-04 17:48   ` [PATCH v2 1/5] clocksource: h8300: Change to overflow interrupt Yoshinori Sato
2015-12-04 17:48   ` [PATCH v2 2/5] clocksource: h8300: Fix timer not overflow case Yoshinori Sato
2015-12-04 17:48   ` [PATCH v2 3/5] clocksource: h8300: Simplify delta handling Yoshinori Sato
2015-12-04 17:48   ` Yoshinori Sato [this message]
2015-12-04 17:48   ` [PATCH v2 5/5] h8300: clocksource: Use ioread / iowrite Yoshinori Sato

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=1449251298-29933-5-git-send-email-ysato@users.sourceforge.jp \
    --to=ysato@users.sourceforge.jp \
    --cc=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