From: <suravee.suthikulpanit@amd.com>
To: marc.zyngier@arm.com, mark.rutland@arm.com, jason@lakedaemon.net
Cc: Mark Rutland <Mark.Rutland@arm.com>,
devicetree@vger.kernel.org, pawel.moll@arm.com,
linux-doc@vger.kernel.org, Marc Zyngier <Marc.Zyngier@arm.com>,
Catalin.Marinas@arm.com, Harish.Kasiviswanathan@amd.com,
linux-kernel@vger.kernel.org, Will.Deacon@arm.com,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>,
linux-pci@vger.kernel.org, tglx@linutronix.de,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] irqchip: gic: Revert the static declaration of irq-gic functions
Date: Fri, 8 Aug 2014 18:17:15 -0500 [thread overview]
Message-ID: <1407539836-9768-4-git-send-email-suravee.suthikulpanit@amd.com> (raw)
In-Reply-To: <1407539836-9768-1-git-send-email-suravee.suthikulpanit@amd.com>
From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
This patch reverts the static declaration of various irq-gic
functions introduced in the fe7ac63fe5393b205b94247239f3d0686a65ee0a
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Mark Rutland <Mark.Rutland@arm.com>
Cc: Marc Zyngier <Marc.Zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
---
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
next prev parent reply other threads:[~2014-08-08 23:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-08 23:17 [PATCH 0/4] irqchip: gic-v2m: Rework GICv2m Initialization suravee.suthikulpanit
2014-08-08 23:17 ` [PATCH 1/4] irqchip: gic-v2m: Remove irq-gic-v2m.h file suravee.suthikulpanit
2014-08-08 23:17 ` [PATCH 2/4] irqchip: gic-v2m: Remove the matching name gic-400-v2m suravee.suthikulpanit
2014-08-08 23:17 ` suravee.suthikulpanit [this message]
2014-08-08 23:17 ` [PATCH 4/4] irqchip: gic-v2m: Restructure the initalization code for v2m suravee.suthikulpanit
2014-08-11 8:12 ` [PATCH 0/4] irqchip: gic-v2m: Rework GICv2m Initialization Marc Zyngier
2014-08-11 13:30 ` Suthikulpanit, Suravee
2014-08-11 14:54 ` Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407539836-9768-4-git-send-email-suravee.suthikulpanit@amd.com \
--to=suravee.suthikulpanit@amd.com \
--cc=Catalin.Marinas@arm.com \
--cc=Harish.Kasiviswanathan@amd.com \
--cc=Will.Deacon@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).