From patchwork Fri Aug 8 23:17:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suravee Suthikulpanit X-Patchwork-Id: 4702111 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 39B189F373 for ; Fri, 8 Aug 2014 23:20:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5AA532015E for ; Fri, 8 Aug 2014 23:20:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A80720109 for ; Fri, 8 Aug 2014 23:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757760AbaHHXUg (ORCPT ); Fri, 8 Aug 2014 19:20:36 -0400 Received: from [207.46.163.244] ([207.46.163.244]:11441 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1757679AbaHHXUb (ORCPT ); Fri, 8 Aug 2014 19:20:31 -0400 Received: from BY2PR02CA010.namprd02.prod.outlook.com (10.255.247.30) by BY2PR02MB042.namprd02.prod.outlook.com (10.242.44.21) with Microsoft SMTP Server (TLS) id 15.0.1005.10; Fri, 8 Aug 2014 23:18:08 +0000 Received: from BL2FFO11FD029.protection.gbl (2a01:111:f400:7c09::167) by BY2PR02CA010.outlook.office365.com (2a01:111:e400:2c16::30) with Microsoft SMTP Server (TLS) id 15.0.1005.10 via Frontend Transport; Fri, 8 Aug 2014 23:18:08 +0000 Received: from atltwp01.amd.com (165.204.84.221) by BL2FFO11FD029.mail.protection.outlook.com (10.173.160.69) with Microsoft SMTP Server id 15.0.990.10 via Frontend Transport; Fri, 8 Aug 2014 23:18:08 +0000 X-WSS-ID: 0NA0GQ3-07-QNV-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp01.amd.com (Axway MailGate 5.3.1) with ESMTPS id 2D79FCAE642; Fri, 8 Aug 2014 18:18:02 -0500 (CDT) Received: from SATLEXDAG03.amd.com (10.181.40.7) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.2.328.9; Fri, 8 Aug 2014 18:18:32 -0500 Received: from ssuthiku-fedora-lt.amd.com (10.180.168.240) by satlexdag03.amd.com (10.181.40.7) with Microsoft SMTP Server id 14.2.328.9; Fri, 8 Aug 2014 19:18:03 -0400 From: To: , , CC: , , , , , , , , , , Suravee Suthikulpanit , Mark Rutland , "Marc Zyngier" Subject: [PATCH 3/4] irqchip: gic: Revert the static declaration of irq-gic functions Date: Fri, 8 Aug 2014 18:17:15 -0500 Message-ID: <1407539836-9768-4-git-send-email-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1407539836-9768-1-git-send-email-suravee.suthikulpanit@amd.com> References: <1407539836-9768-1-git-send-email-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221; CTRY:US; IPV:NLI; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019004)(6009001)(428002)(199002)(189002)(95666004)(19580405001)(83322001)(19580395003)(64706001)(53416004)(44976005)(84676001)(81542001)(21056001)(48376002)(99396002)(105586002)(33646002)(89996001)(85306004)(81342001)(50466002)(76482001)(101416001)(46102001)(47776003)(87286001)(20776003)(92726001)(83072002)(85852003)(97736001)(92566001)(77156001)(77982001)(68736004)(62966002)(88136002)(86152002)(2201001)(229853001)(102836001)(50226001)(4396001)(107046002)(74502001)(74662001)(77096002)(106466001)(87936001)(80022001)(575784001)(31966008)(79102001)(104166001)(50986999)(76176999)(86362001)(93916002)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR02MB042; H:atltwp01.amd.com; FPR:; MLV:sfv; PTR:InfoDomainNonexistent; MX:1; LANG:en; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:; X-Forefront-PRVS: 02973C87BC Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; X-OriginatorOrg: amd4.onmicrosoft.com Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Suravee Suthikulpanit This patch reverts the static declaration of various irq-gic functions introduced in the fe7ac63fe5393b205b94247239f3d0686a65ee0a Signed-off-by: Suravee Suthikulpanit Cc: Mark Rutland Cc: Marc Zyngier Cc: Jason Cooper --- drivers/irqchip/irq-gic.c | 10 +++++----- drivers/irqchip/irq-gic.h | 13 ------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 29ee97a..cedaeb4 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -172,7 +172,7 @@ void gic_unmask_irq(struct irq_data *d) raw_spin_unlock(&irq_controller_lock); } -void gic_eoi_irq(struct irq_data *d) +static void gic_eoi_irq(struct irq_data *d) { if (gic_arch_extn.irq_eoi) { raw_spin_lock(&irq_controller_lock); @@ -183,7 +183,7 @@ void gic_eoi_irq(struct irq_data *d) writel_relaxed(gic_irq(d), gic_cpu_base(d) + GIC_CPU_EOI); } -int gic_set_type(struct irq_data *d, unsigned int type) +static int gic_set_type(struct irq_data *d, unsigned int type) { void __iomem *base = gic_dist_base(d); unsigned int gicirq = gic_irq(d); @@ -207,7 +207,7 @@ int gic_set_type(struct irq_data *d, unsigned int type) return 0; } -int gic_retrigger(struct irq_data *d) +static int gic_retrigger(struct irq_data *d) { if (gic_arch_extn.irq_retrigger) return gic_arch_extn.irq_retrigger(d); @@ -217,7 +217,7 @@ int gic_retrigger(struct irq_data *d) } #ifdef CONFIG_SMP -int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, +static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force) { void __iomem *reg = gic_dist_base(d) + GIC_DIST_TARGET + (gic_irq(d) & ~3); @@ -244,7 +244,7 @@ int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, #endif #ifdef CONFIG_PM -int gic_set_wake(struct irq_data *d, unsigned int on) +static int gic_set_wake(struct irq_data *d, unsigned int on) { int ret = -ENXIO; diff --git a/drivers/irqchip/irq-gic.h b/drivers/irqchip/irq-gic.h index 1c6547d..83aa772 100644 --- a/drivers/irqchip/irq-gic.h +++ b/drivers/irqchip/irq-gic.h @@ -50,18 +50,5 @@ int _gic_of_init(struct device_node *node, void gic_mask_irq(struct irq_data *d); void gic_unmask_irq(struct irq_data *d); -void gic_eoi_irq(struct irq_data *d); -int gic_set_type(struct irq_data *d, unsigned int type); -int gic_retrigger(struct irq_data *d); - -#ifdef CONFIG_SMP -int gic_set_affinity(struct irq_data *d, - const struct cpumask *mask_val, - bool force); -#endif - -#ifdef CONFIG_PM -int gic_set_wake(struct irq_data *d, unsigned int on); -#endif #endif /* _IRQ_GIC_H_ */