Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936425Ab3DHVan (ORCPT ); Mon, 8 Apr 2013 17:30:43 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:38740 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936236Ab3DHV1h (ORCPT ); Mon, 8 Apr 2013 17:27:37 -0400 X-IronPort-AV: E=Sophos;i="4.87,433,1363158000"; d="scan'208";a="36684214" From: Stephen Boyd To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Russell King Subject: [PATCHv4 03/11] ARM: smp: Remove duplicate dummy timer implementation Date: Mon, 8 Apr 2013 14:27:25 -0700 Message-Id: <1365456453-16297-4-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1365456453-16297-1-git-send-email-sboyd@codeaurora.org> References: <1365456453-16297-1-git-send-email-sboyd@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1644 Lines: 58 Drop ARM's version of the dummy timer now that we have a generic implementation in drivers/clocksource. Cc: Russell King Signed-off-by: Stephen Boyd --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/