From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757779AbaHHXUh (ORCPT ); Fri, 8 Aug 2014 19:20:37 -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 X-WSS-ID: 0NA0GQ3-07-QNV-02 X-M-MSG: 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 Content-Type: text/plain 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 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; X-OriginatorOrg: amd4.onmicrosoft.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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_ */ -- 1.9.0