All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Boyd <sboyd@codeaurora.org>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	Russell King <linux@arm.linux.org.uk>
Subject: [PATCHv4 03/11] ARM: smp: Remove duplicate dummy timer implementation
Date: Mon,  8 Apr 2013 14:27:25 -0700	[thread overview]
Message-ID: <1365456453-16297-4-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1365456453-16297-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.

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 79078ed..4de4d14 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -469,24 +469,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
@@ -510,8 +492,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

WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv4 03/11] ARM: smp: Remove duplicate dummy timer implementation
Date: Mon,  8 Apr 2013 14:27:25 -0700	[thread overview]
Message-ID: <1365456453-16297-4-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1365456453-16297-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.

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 79078ed..4de4d14 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -469,24 +469,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
@@ -510,8 +492,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

  parent reply	other threads:[~2013-04-08 21:27 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-08 21:27 [PATCHv4 00/11] Remove ARM local timer API Stephen Boyd
2013-04-08 21:27 ` Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 01/11] clockevents: Prefer CPU local devices over global devices Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-09 10:33   ` Mark Rutland
2013-04-09 10:33     ` Mark Rutland
2013-04-09 10:33     ` Mark Rutland
2013-04-09 16:49     ` Stephen Boyd
2013-04-09 16:49       ` Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 02/11] clocksource: add generic dummy timer driver Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27 ` Stephen Boyd [this message]
2013-04-08 21:27   ` [PATCHv4 03/11] ARM: smp: Remove duplicate dummy timer implementation Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 04/11] ARM: smp_twd: Divorce smp_twd from local timer API Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 05/11] ARM: OMAP2+: Divorce " Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 06/11] ARM: EXYNOS4: Divorce mct " Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 07/11] ARM: PRIMA2: Divorce timer-marco " Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 08/11] ARM: msm: Divorce msm_timer " Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 09/11] clocksource: time-armada-370-xp: Fix sparse warning Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 10/11] clocksource: time-armada-370-xp: Divorce from local timer API Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-08 21:27 ` [PATCHv4 11/11] ARM: smp: Remove " Stephen Boyd
2013-04-08 21:27   ` Stephen Boyd
2013-04-17 20:44 ` [PATCHv4 00/11] Remove ARM " Stephen Boyd
2013-04-17 20:44   ` Stephen Boyd
2013-04-18 16:39   ` Olof Johansson
2013-04-18 16:39     ` Olof Johansson

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=1365456453-16297-4-git-send-email-sboyd@codeaurora.org \
    --to=sboyd@codeaurora.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.