From: Guan Xuetao <epip@hera.kernel.org>
To: arnd@arndb.de
Cc: GuanXuetao <gxt@mprc.pku.edu.cn>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
greg@kroah.com
Subject: [PATCH 06/17] unicore32 time.c: change calculate method for clock_event_device
Date: Sun, 27 Feb 2011 15:59:34 +0000 [thread overview]
Message-ID: <5c1cbf284fb0ca905fc3f44a9d17e9cbebfd814e.1298821856.git.epip@hera.kernel.org> (raw)
In-Reply-To: <cover.1298821856.git.epip@hera.kernel.org>
In-Reply-To: <cover.1298821856.git.epip@hera.kernel.org>
From: GuanXuetao <gxt@mprc.pku.edu.cn>
apply clockevents_calc_mult_shift() to get rid of
shift assignment and mult calculation for osmr0
-- by advice with Thomas Gleixner
Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
---
arch/unicore32/kernel/time.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/unicore32/kernel/time.c b/arch/unicore32/kernel/time.c
index 8090d76..8bb4b81 100644
--- a/arch/unicore32/kernel/time.c
+++ b/arch/unicore32/kernel/time.c
@@ -66,11 +66,6 @@ puv3_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)
static struct clock_event_device ckevt_puv3_osmr0 = {
.name = "osmr0",
.features = CLOCK_EVT_FEAT_ONESHOT,
-#ifdef CONFIG_ARCH_FPGA
- .shift = 18, /* correct shift val: 16, but warn_on_slowpath */
-#else
- .shift = 30,
-#endif
.rating = 200,
.set_next_event = puv3_osmr0_set_next_event,
.set_mode = puv3_osmr0_set_mode,
@@ -101,8 +96,8 @@ void __init time_init(void)
OST_OIER = 0; /* disable any timer interrupts */
OST_OSSR = 0; /* clear status on all timers */
- ckevt_puv3_osmr0.mult =
- div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, ckevt_puv3_osmr0.shift);
+ clockevents_calc_mult_shift(&ckevt_puv3_osmr0, CLOCK_TICK_RATE, 5);
+
ckevt_puv3_osmr0.max_delta_ns =
clockevent_delta2ns(0x7fffffff, &ckevt_puv3_osmr0);
ckevt_puv3_osmr0.min_delta_ns =
--
1.7.4.1
next prev parent reply other threads:[~2011-02-27 15:59 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-27 15:59 [PATCH 00/17] unicore32: resend patches after machine related files Guan Xuetao
2011-02-27 15:59 ` [PATCH 01/17] unicore32 machine related files: core files Guan Xuetao
2011-02-28 15:14 ` Arnd Bergmann
2011-02-28 15:14 ` Arnd Bergmann
2011-02-27 15:59 ` [PATCH 02/17] unicore32 machine related files: hardware registers Guan Xuetao
2011-02-27 15:59 ` Guan Xuetao
2011-02-27 15:59 ` [PATCH 03/17] unicore32 machine related files: pci bus handling Guan Xuetao
2011-02-27 15:59 ` [PATCH 04/17] unicore32 machine related files: ps2 driver Guan Xuetao
2011-02-27 15:59 ` Guan Xuetao
2011-02-27 15:59 ` [PATCH 05/17] unicore32: ADD MAINTAINER for unicore32 architecture Guan Xuetao
2011-02-27 15:59 ` Guan Xuetao [this message]
2011-02-27 15:59 ` [PATCH 06/17] unicore32 time.c: change calculate method for clock_event_device Guan Xuetao
2011-02-27 15:59 ` [PATCH 07/17] unicore32: remove unused lines in arch/unicore32/include/asm/irq.h Guan Xuetao
2011-02-27 15:59 ` [PATCH 08/17] unicore32: modify function names and parameters for irq_chips Guan Xuetao
2011-02-27 15:59 ` Guan Xuetao
2011-02-27 15:59 ` [PATCH 09/17] unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE Guan Xuetao
2011-02-27 15:59 ` [PATCH 10/17] unicore32 i8042: adjust io funcs of i8042-unicore32io.h Guan Xuetao
2011-02-27 15:59 ` Guan Xuetao
2011-02-27 15:59 ` [PATCH 11/17] unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call Guan Xuetao
2011-02-27 15:59 ` Guan Xuetao
2011-02-27 15:59 ` [PATCH 12/17] unicore32 i8042 upgrade and bugfix: adjust resource request region type Guan Xuetao
2011-02-27 15:59 ` Guan Xuetao
2011-02-27 15:59 ` [PATCH 13/17] unicore32 io: redefine __REG(x) and re-use readl/writel funcs Guan Xuetao
2011-02-27 15:59 ` Guan Xuetao
2011-02-28 15:17 ` Arnd Bergmann
2011-03-04 8:00 ` Guan Xuetao
2011-03-04 9:49 ` Arnd Bergmann
2011-02-27 15:59 ` [PATCH 14/17] unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc Guan Xuetao
2011-02-28 15:21 ` Arnd Bergmann
2011-02-27 15:59 ` [PATCH 15/17] unicore32 machine related: add frame buffer driver " Guan Xuetao
2011-02-28 15:18 ` Arnd Bergmann
2011-02-28 15:18 ` Arnd Bergmann
2011-02-27 15:59 ` [PATCH 16/17] unicore32: add (void __iomem *) to io_p2v macro Guan Xuetao
2011-02-28 15:35 ` Arnd Bergmann
2011-03-04 10:12 ` Guan Xuetao
2011-03-04 11:52 ` Arnd Bergmann
2011-02-27 15:59 ` [PATCH 17/17] unicore32: replace unicore32-specific iomap functions with generic lib implementation Guan Xuetao
2011-02-28 15:20 ` Arnd Bergmann
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=5c1cbf284fb0ca905fc3f44a9d17e9cbebfd814e.1298821856.git.epip@hera.kernel.org \
--to=epip@hera.kernel.org \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=gxt@mprc.pku.edu.cn \
--cc=linux-arch@vger.kernel.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).