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: "Suthikulpanit, Suravee" X-Patchwork-Id: 35171 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D55FB21457 for ; Fri, 8 Aug 2014 23:19:41 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id v10sf9564645pde.2 for ; Fri, 08 Aug 2014 16:19:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=rL0Kk5t/Z1/GcUcmQJEzXvM0NUQEJUGJ/NJogjAdHb4=; b=BRtvHsAvwGK3YZRm3Ev+nQMrFmPSdRauIblLAVStXQH3lbfu+rthRl+Ye+kE90qLII WK21uoVWhHONE1QoReKNHM5gFiAemi0/YnbGc9scnCknHcsjZKOVOMu0d0ZUZ3HMOYPX 4R1rvcxmfJNVjqA4pneXJ21PFMKAD6Z5+ehNR5r9pk5KocImeF4uyVfeCcqJclEt535g hRWHXTb2oG5+hRLgYvRqykw0RThXfwJoDtAEye5JIb9GPlNrkQcdt8T3Uv9olc8hxcSa ewmPWxq2Diu081xjM00TlLQsKc+7GhoSFX6VxOO36dYjJerCSoZBpvWv5dkGSUVMXlhQ 0YUw== X-Gm-Message-State: ALoCoQkJ6DXFFVeDcR6SAVQDIPl8EadcePc432FVUEjBWaAWaaQDS5qOn4owbOT0Qa8xKYku+goV X-Received: by 10.66.147.227 with SMTP id tn3mr14782967pab.4.1407539981146; Fri, 08 Aug 2014 16:19:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.138 with SMTP id o10ls739707qga.98.gmail; Fri, 08 Aug 2014 16:19:41 -0700 (PDT) X-Received: by 10.220.105.201 with SMTP id u9mr24155395vco.11.1407539980987; Fri, 08 Aug 2014 16:19:40 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id l3si3365297vdc.59.2014.08.08.16.19.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 08 Aug 2014 16:19:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so9002146vcb.7 for ; Fri, 08 Aug 2014 16:19:40 -0700 (PDT) X-Received: by 10.220.82.202 with SMTP id c10mr24213026vcl.31.1407539980618; Fri, 08 Aug 2014 16:19:40 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp160809vcb; Fri, 8 Aug 2014 16:19:40 -0700 (PDT) X-Received: by 10.70.34.39 with SMTP id w7mr27203755pdi.19.1407539979682; Fri, 08 Aug 2014 16:19:39 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id al7si7131573pbd.120.2014.08.08.16.19.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Aug 2014 16:19:39 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XFtQf-0000WX-5j; Fri, 08 Aug 2014 23:18:33 +0000 Received: from mail-by2lp0237.outbound.protection.outlook.com ([207.46.163.237] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XFtQd-0000LK-0O for linux-arm-kernel@lists.infradead.org; Fri, 08 Aug 2014 23:18:31 +0000 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: , , 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) X-OriginatorOrg: amd4.onmicrosoft.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140808_161831_050940_5628BE4E X-CRM114-Status: GOOD ( 10.99 ) X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [207.46.163.237 listed in list.dnswl.org] -0.7 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [207.46.163.237 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record Cc: Mark Rutland , devicetree@vger.kernel.org, pawel.moll@arm.com, linux-doc@vger.kernel.org, Marc Zyngier , Catalin.Marinas@arm.com, Harish.Kasiviswanathan@amd.com, linux-kernel@vger.kernel.org, Will.Deacon@arm.com, Suravee Suthikulpanit , linux-pci@vger.kernel.org, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: suravee.suthikulpanit@amd.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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_ */