From 3276099fd38be5de81923288f49c2e2419078f92 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Mon, 20 Aug 2012 11:53:36 +0100
Subject: [PATCH] --- yaml --- r: 329951 b: refs/heads/master c:
 80633f05b0dbf5819ef28f626f2f0b7c885d1f88 h: refs/heads/master i:   329949:
 ed5737a2c6fba366d522c6c01f2cb2881f112b51   329947:
 fc3a89c2206811538796689f70e28065da1b45db   329943:
 09a58520182b121fae13e94698b751a8b6cbe5c2   329935:
 a8f1797d182f31a3a5864d6ed88c48ebf36a39f0   329919:
 c6b6a50408c0d6bd46e04d4b293003dc59ac4e8b v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/mfd/ab8500-core.c         | 33 ++++++++++++-------------
 trunk/include/linux/mfd/abx500/ab8500.h |  2 --
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index fa7e75fa54c0..b25b3910b196 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f600ada70beeb1dfe08e11e871bf31015aa0a3d
+refs/heads/master: 80633f05b0dbf5819ef28f626f2f0b7c885d1f88
diff --git a/trunk/drivers/mfd/ab8500-core.c b/trunk/drivers/mfd/ab8500-core.c
index 47adf800024e..dd91951c68f0 100644
--- a/trunk/drivers/mfd/ab8500-core.c
+++ b/trunk/drivers/mfd/ab8500-core.c
@@ -472,6 +472,22 @@ static irqreturn_t ab8500_hierarchical_irq(int irq, void *dev)
 	return IRQ_HANDLED;
 }
 
+/**
+ * ab8500_irq_get_virq(): Map an interrupt on a chip to a virtual IRQ
+ *
+ * @ab8500: ab8500_irq controller to operate on.
+ * @irq: index of the interrupt requested in the chip IRQs
+ *
+ * Useful for drivers to request their own IRQs.
+ */
+static int ab8500_irq_get_virq(struct ab8500 *ab8500, int irq)
+{
+	if (!ab8500)
+		return -EINVAL;
+
+	return irq_create_mapping(ab8500->domain, irq);
+}
+
 static irqreturn_t ab8500_irq(int irq, void *dev)
 {
 	struct ab8500 *ab8500 = dev;
@@ -511,23 +527,6 @@ static irqreturn_t ab8500_irq(int irq, void *dev)
 	return IRQ_HANDLED;
 }
 
-/**
- * ab8500_irq_get_virq(): Map an interrupt on a chip to a virtual IRQ
- *
- * @ab8500: ab8500_irq controller to operate on.
- * @irq: index of the interrupt requested in the chip IRQs
- *
- * Useful for drivers to request their own IRQs.
- */
-int ab8500_irq_get_virq(struct ab8500 *ab8500, int irq)
-{
-	if (!ab8500)
-		return -EINVAL;
-
-	return irq_create_mapping(ab8500->domain, irq);
-}
-EXPORT_SYMBOL_GPL(ab8500_irq_get_virq);
-
 static int ab8500_irq_map(struct irq_domain *d, unsigned int virq,
 				irq_hw_number_t hwirq)
 {
diff --git a/trunk/include/linux/mfd/abx500/ab8500.h b/trunk/include/linux/mfd/abx500/ab8500.h
index 3764cb6759e3..1491044efa10 100644
--- a/trunk/include/linux/mfd/abx500/ab8500.h
+++ b/trunk/include/linux/mfd/abx500/ab8500.h
@@ -341,6 +341,4 @@ static inline int is_ab8500_2p0(struct ab8500 *ab)
 	return (is_ab8500(ab) && (ab->chip_id == AB8500_CUT2P0));
 }
 
-int ab8500_irq_get_virq(struct ab8500 *ab8500, int irq);
-
 #endif /* MFD_AB8500_H */