From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv7 03/11] ARM: smp: Remove duplicate dummy timer implementation
Date: Mon, 3 Jun 2013 13:33:54 -0700 [thread overview]
Message-ID: <1370291642-13259-4-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1370291642-13259-1-git-send-email-sboyd@codeaurora.org>
Drop ARM's version of the dummy timer now that we have a generic
implementation in drivers/clocksource.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>,
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/kernel/smp.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 47ab905..4dc883a 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -503,24 +503,6 @@ void tick_broadcast(const struct cpumask *mask)
}
#endif
-static void broadcast_timer_set_mode(enum clock_event_mode mode,
- struct clock_event_device *evt)
-{
-}
-
-static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt)
-{
- evt->name = "dummy_timer";
- evt->features = CLOCK_EVT_FEAT_ONESHOT |
- CLOCK_EVT_FEAT_PERIODIC |
- CLOCK_EVT_FEAT_DUMMY;
- evt->rating = 100;
- evt->mult = 1;
- evt->set_mode = broadcast_timer_set_mode;
-
- clockevents_register_device(evt);
-}
-
static struct local_timer_ops *lt_ops;
#ifdef CONFIG_LOCAL_TIMERS
@@ -544,8 +526,8 @@ static void __cpuinit percpu_timer_setup(void)
evt->cpumask = cpumask_of(cpu);
- if (!lt_ops || lt_ops->setup(evt))
- broadcast_timer_setup(evt);
+ if (lt_ops)
+ lt_ops->setup(evt);
}
#ifdef CONFIG_HOTPLUG_CPU
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2013-06-03 20:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-03 20:33 [PATCHv7 00/11] Remove ARM local timer API Stephen Boyd
2013-06-03 20:33 ` [PATCHv7 01/11] clockevents: Prefer CPU local devices over global devices Stephen Boyd
2013-06-06 15:12 ` Daniel Lezcano
2013-06-06 18:04 ` Stephen Boyd
2013-06-06 22:30 ` Daniel Lezcano
2013-06-06 22:38 ` Stephen Boyd
2013-06-12 21:44 ` Stephen Boyd
2013-06-13 9:33 ` Daniel Lezcano
2013-06-13 13:15 ` Thomas Gleixner
2013-06-13 18:39 ` Stephen Boyd
2013-06-13 20:16 ` Sören Brinkmann
2013-06-18 10:22 ` Mark Rutland
2013-06-19 16:30 ` Stephen Boyd
2013-06-21 17:07 ` Stephen Boyd
2013-06-24 20:07 ` Stephen Boyd
2013-06-03 20:33 ` [PATCHv7 02/11] clocksource: add generic dummy timer driver Stephen Boyd
2013-06-06 16:23 ` Daniel Lezcano
2013-06-03 20:33 ` Stephen Boyd [this message]
2013-06-03 20:33 ` [PATCHv7 04/11] ARM: smp_twd: Divorce smp_twd from local timer API Stephen Boyd
2013-06-03 20:33 ` [PATCHv7 05/11] ARM: OMAP2+: Divorce " Stephen Boyd
2013-06-03 20:33 ` [PATCHv7 06/11] ARM: EXYNOS4: Divorce mct " Stephen Boyd
2013-06-03 20:33 ` [PATCHv7 07/11] ARM: PRIMA2: Divorce timer-marco " Stephen Boyd
2013-06-03 20:33 ` [PATCHv7 08/11] ARM: msm: Divorce msm_timer " Stephen Boyd
2013-06-03 20:34 ` [PATCHv7 09/11] clocksource: time-armada-370-xp: Fix sparse warning Stephen Boyd
2013-06-03 20:34 ` [PATCHv7 10/11] clocksource: time-armada-370-xp: Divorce from local timer API Stephen Boyd
2013-06-03 20:34 ` [PATCHv7 11/11] ARM: smp: Remove " Stephen Boyd
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=1370291642-13259-4-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.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).