Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1284120

[PATCH v2 4/5] clocksource: h8300: Initializer cleanup.

Show all headers | View raw

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] clocksource: h8300: driver update Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-12-04 07:00 +0100
  [PATCH 4/5] clocksource: h8300: Initializer cleanup. Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-12-04 07:00 +0100
  [PATCH 3/5] clocksource: h8300: Simplify delta handling Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-12-04 07:00 +0100
  [PATCH v2 0/5] h8300 clocksource update Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-12-04 18:50 +0100
    [PATCH v2 2/5] clocksource: h8300: Fix timer not overflow case Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-12-04 18:50 +0100
    [PATCH v2 3/5] clocksource: h8300: Simplify delta handling Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-12-04 18:50 +0100
    [PATCH v2 5/5] h8300: clocksource: Use ioread / iowrite Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-12-04 18:50 +0100
    [PATCH v2 1/5] clocksource: h8300: Change to overflow interrupt Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-12-04 18:50 +0100
    [PATCH v2 4/5] clocksource: h8300: Initializer cleanup. Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-12-04 18:50 +0100

csiph-web