From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: daniel.lezcano@linaro.org
Cc: ysato@users.sourceforge.jp, tglx@linutronix.de,
linux-kernel@vger.kernel.org,
uclinux-h8-devel@lists.sourceforge.jp (moderated list:H8/300
ARCHITECTURE)
Subject: [PATCH 06/15] clocksource/drivers/h8300_timer8: Remove PERIODIC and ONESHOT macro
Date: Mon, 9 Nov 2015 11:06:44 +0100 [thread overview]
Message-ID: <1447063614-4662-6-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1447063614-4662-1-git-send-email-daniel.lezcano@linaro.org>
Specify the delta as parameter for the timer8_clock_event_start function
instead of using a macro to tell PERIODIC or ONESHOT.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/h8300_timer8.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c
index 88b9b06..2433325 100644
--- a/drivers/clocksource/h8300_timer8.c
+++ b/drivers/clocksource/h8300_timer8.c
@@ -28,9 +28,6 @@
#define FLAG_IRQCONTEXT (1 << 2)
#define FLAG_STARTED (1 << 3)
-#define ONESHOT 0
-#define PERIODIC 1
-
#define SCALE 64
struct timer8_priv {
@@ -147,7 +144,7 @@ static inline struct timer8_priv *ced_to_priv(struct clock_event_device *ced)
return container_of(ced, struct timer8_priv, ced);
}
-static void timer8_clock_event_start(struct timer8_priv *p, int periodic)
+static void timer8_clock_event_start(struct timer8_priv *p, unsigned long delta)
{
struct clock_event_device *ced = &p->ced;
@@ -158,7 +155,7 @@ static void timer8_clock_event_start(struct timer8_priv *p, int periodic)
ced->max_delta_ns = clockevent_delta2ns(0xffff, ced);
ced->min_delta_ns = clockevent_delta2ns(0x0001, ced);
- timer8_set_next(p, periodic?(p->rate + HZ/2) / HZ:0x10000);
+ timer8_set_next(p, delta);
}
static int timer8_clock_event_shutdown(struct clock_event_device *ced)
@@ -173,7 +170,7 @@ static int timer8_clock_event_periodic(struct clock_event_device *ced)
pr_info("%s: used for periodic clock events\n", ced->name);
timer8_stop(p);
- timer8_clock_event_start(p, PERIODIC);
+ timer8_clock_event_start(p, (p->rate + HZ/2) / HZ);
return 0;
}
@@ -184,7 +181,7 @@ static int timer8_clock_event_oneshot(struct clock_event_device *ced)
pr_info("%s: used for oneshot clock events\n", ced->name);
timer8_stop(p);
- timer8_clock_event_start(p, ONESHOT);
+ timer8_clock_event_start(p, 0x10000);
return 0;
}
--
1.9.1
next prev parent reply other threads:[~2015-11-09 10:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-09 10:06 [PATCH 01/15] clocksource/drivers/h8300_timer8: Fix compilation error with dev_warn Daniel Lezcano
2015-11-09 10:06 ` [PATCH 02/15] clocksource/drivers/h8300_tpu: Remove unused macros Daniel Lezcano
2015-11-11 14:38 ` Yoshinori Sato
2015-11-09 10:06 ` [PATCH 03/15] clocksource/drivers/h8300_tpu: Remove pointless headers for TPU Daniel Lezcano
2015-11-11 14:39 ` Yoshinori Sato
2015-11-09 10:06 ` [PATCH 04/15] clocksource/drivers/h8300_timer8: Remove unused headers Daniel Lezcano
2015-11-09 10:06 ` [PATCH 05/15] clocksource/drivers/h8300_timer8: Remove unused macros Daniel Lezcano
2015-11-09 10:06 ` Daniel Lezcano [this message]
2015-11-09 10:06 ` [PATCH 07/15] clocksource/drivers/h8300_timer8: Fix irq return value check Daniel Lezcano
2015-11-09 10:06 ` [PATCH 08/15] clocksource/drivers/h8300_timer8: Remove pointless irq re-entrant safe code Daniel Lezcano
2015-11-09 10:06 ` [PATCH 09/15] clocksource/drivers/h8300_timer8: Remove irq and lock legacy code Daniel Lezcano
2015-11-09 10:06 ` [PATCH 10/15] clocksource/drivers/h8300_timer8: Retrieve the clock rate at init time Daniel Lezcano
2015-11-09 10:06 ` [PATCH 11/15] clocksource/drivers/h8300_timer16: Remove pointless headers Daniel Lezcano
2015-11-09 10:06 ` [PATCH 12/15] clocksource/drivers/h8300_timer16: Remove unused macros Daniel Lezcano
2015-11-09 10:06 ` [PATCH 13/15] clocksource/drivers/h8300_timer16: Remove unused fields in timer16_priv Daniel Lezcano
2015-11-09 10:06 ` [PATCH 14/15] clocksource/drivers/h8300_timer16: Fix irq return value check Daniel Lezcano
2015-11-09 10:06 ` [PATCH 15/15] clocksource/drivers/h8300_timer16: Remove pointless lock Daniel Lezcano
2015-11-09 10:13 ` [PATCH 01/15] clocksource/drivers/h8300_timer8: Fix compilation error with dev_warn Daniel Lezcano
2015-11-11 14:50 ` [PATCH 0/4] h8300: clock driver update Yoshinori Sato
2015-11-11 14:50 ` [PATCH 1/4] h8300: clocksource: Use overflow interrupt Yoshinori Sato
2015-11-12 16:50 ` Daniel Lezcano
2015-11-11 14:50 ` [PATCH 2/4] h8300: clocksource: Counter overflow fix Yoshinori Sato
2015-11-11 14:50 ` [PATCH 3/4] h8300: clocksource: More simplify timer8_set_next Yoshinori Sato
2015-11-11 14:50 ` [PATCH 4/4] h8300: clocksource: remove unused local-variable Yoshinori Sato
2015-11-12 16:28 ` [PATCH 0/4] h8300: clock driver update Daniel Lezcano
2015-11-17 12:20 ` Daniel Lezcano
2015-11-18 16:58 ` 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=1447063614-4662-6-git-send-email-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
--cc=ysato@users.sourceforge.jp \
/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
Powered by JetHome