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

Groups > linux.kernel > #1481070

[PATCH 1/9] clocksource/drivers/moxart: Refactor enable/disable

Show all headers | View raw

From: Joel Stanley <joel@jms.id.au>

This patch abstracts the enable and disable register writes into their
own functions in preparation for future changes to use SoC specific
values for the writes.

Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/moxart_timer.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c
index 8414544..a3aaa56 100644
--- a/drivers/clocksource/moxart_timer.c
+++ b/drivers/clocksource/moxart_timer.c
@@ -58,15 +58,25 @@
 static void __iomem *base;
 static unsigned int clock_count_per_tick;
 
-static int moxart_shutdown(struct clock_event_device *evt)
+static inline void moxart_disable(struct clock_event_device *evt)
 {
 	writel(TIMER1_DISABLE, base + TIMER_CR);
+}
+
+static inline void moxart_enable(struct clock_event_device *evt)
+{
+	writel(TIMER1_ENABLE, base + TIMER_CR);
+}
+
+static int moxart_shutdown(struct clock_event_device *evt)
+{
+	moxart_disable(evt);
 	return 0;
 }
 
 static int moxart_set_oneshot(struct clock_event_device *evt)
 {
-	writel(TIMER1_DISABLE, base + TIMER_CR);
+	moxart_disable(evt);
 	writel(~0, base + TIMER1_BASE + REG_LOAD);
 	return 0;
 }
@@ -74,21 +84,21 @@ static int moxart_set_oneshot(struct clock_event_device *evt)
 static int moxart_set_periodic(struct clock_event_device *evt)
 {
 	writel(clock_count_per_tick, base + TIMER1_BASE + REG_LOAD);
-	writel(TIMER1_ENABLE, base + TIMER_CR);
+	moxart_enable(evt);
 	return 0;
 }
 
 static int moxart_clkevt_next_event(unsigned long cycles,
-				    struct clock_event_device *unused)
+				    struct clock_event_device *evt)
 {
 	u32 u;
 
-	writel(TIMER1_DISABLE, base + TIMER_CR);
+	moxart_disable(evt);
 
 	u = readl(base + TIMER1_BASE + REG_COUNT) - cycles;
 	writel(u, base + TIMER1_BASE + REG_MATCH1);
 
-	writel(TIMER1_ENABLE, base + TIMER_CR);
+	moxart_enable(evt);
 
 	return 0;
 }
-- 
2.7.4

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

Thread

[PULL] clockevents for 4.9 Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-09-12 11:20 +0200
  [PATCH 7/9] clocksource/drivers/timer-atmel-pit: Remove uselesss WARN_ON_ONCE Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-09-12 11:20 +0200
  [PATCH 1/9] clocksource/drivers/moxart: Refactor enable/disable Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-09-12 11:20 +0200
    [PATCH 5/9] clocksource/drivers/moxart: Replace panic by pr_err Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-09-12 11:20 +0200
    [PATCH 9/9] clocksource/drivers/oxnas: Add OX820 compatible Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-09-12 11:20 +0200
    [PATCH 8/9] clocksource/drivers/timer-atmel-pit: Simplify IRQ handler Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-09-12 11:20 +0200
    [PATCH 3/9] clocksource/drivers/moxart: Add Aspeed support Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-09-12 11:20 +0200
    [PATCH 2/9] clocksource/drivers/moxart: Use struct to hold state Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-09-12 11:20 +0200
    [PATCH 4/9] clocksource/drivers/moxart: Replace setup_irq by request_irq Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-09-12 11:20 +0200

csiph-web