From patchwork Fri Jun 3 14:57:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 847352 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p53F23YM023435 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 3 Jun 2011 15:02:26 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QSVsA-0000t1-6O; Fri, 03 Jun 2011 15:01:14 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QSVs9-0000Uz-GX; Fri, 03 Jun 2011 15:01:13 +0000 Received: from service87.mimecast.com ([94.185.240.25]) by canuck.infradead.org with smtp (Exim 4.76 #1 (Red Hat Linux)) id 1QSVoX-0007lJ-7r for linux-arm-kernel@lists.infradead.org; Fri, 03 Jun 2011 14:57:31 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 03 Jun 2011 15:57:27 +0100 Received: from localhost.localdomain ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 3 Jun 2011 15:57:24 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 18/18] ARM: simplify percpu_timer_ack Date: Fri, 3 Jun 2011 15:57:33 +0100 Message-Id: <1307113053-30209-19-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1307113053-30209-1-git-send-email-marc.zyngier@arm.com> References: <1307113053-30209-1-git-send-email-marc.zyngier@arm.com> X-OriginalArrivalTime: 03 Jun 2011 14:57:24.0475 (UTC) FILETIME=[8C375CB0:01CC21FE] X-MC-Unique: 111060315572705301 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110603_105729_769468_49C58F2E X-CRM114-Status: GOOD ( 11.57 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [94.185.240.25 listed in list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 03 Jun 2011 15:02:26 +0000 (UTC) There is no provider of local_timer_ack anymore after the conversion of msm to the percpu_timer interface. Remove the weak local_timer_ack symbol and directly call percpu_timer_ack. Acked-by: Catalin Marinas Signed-off-by: Marc Zyngier --- arch/arm/kernel/percpu_timer.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/arch/arm/kernel/percpu_timer.c b/arch/arm/kernel/percpu_timer.c index f442d3f..da796cb 100644 --- a/arch/arm/kernel/percpu_timer.c +++ b/arch/arm/kernel/percpu_timer.c @@ -56,10 +56,6 @@ void percpu_timer_register(struct local_timer_ops *ops) * * If a local timer interrupt has occurred, acknowledge and return 1. * Otherwise, return 0. - * - * This can be overloaded by platform code that doesn't provide its - * timer in timer_fns way (msm at the moment). Once all platforms have - * migrated, the weak alias can be removed. * If no ack() function has been registered, consider the acknowledgement * to be done. */ @@ -71,8 +67,6 @@ static int percpu_timer_ack(void) return 1; } -int local_timer_ack(void) __attribute__ ((weak, alias("percpu_timer_ack"))); - /* * Timer (local or broadcast) support */ @@ -82,7 +76,7 @@ irqreturn_t percpu_timer_handler(int irq, void *dev_id) { struct clock_event_device *evt = dev_id; - if (local_timer_ack()) { + if (percpu_timer_ack()) { evt->event_handler(evt); return IRQ_HANDLED; }