[PATCH/RFC,168/390] Revert "pinctrl: remove pinctrl_remove_gpio_range"

Commit Message

Simon Horman March 29, 2013, 2:41 a.m. UTC

From: Viresh Kumar <[e-mail]>

This reverts earlier commit which removed
pinctrl_remove_gpio_range(), because at that time there
weren't any more users of that routine. It was removed as the
removal of ranges was done in unregister of pinctrl.

But as we are now registering stuff from gpiolib, we may
remove and insert a gpio module multiple times. So, we
need this routine again.

Signed-off-by: Viresh Kumar <[e-mail]>
Signed-off-by: Linus Walleij <[e-mail]>
(cherry picked from commit 7e10ee68f8ccc62e0934ff02f39ce541f3879844)

Conflicts:
	include/linux/pinctrl/pinctrl.h

Signed-off-by: Simon Horman <[e-mail]>
---
 drivers/pinctrl/core.c          |   14 ++++++++++++++
 include/linux/pinctrl/pinctrl.h |    2 ++
 2 files changed, 16 insertions(+)

Patch

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index d4c29b5b..cc1d7cb 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -366,6 +366,20 @@  struct pinctrl_dev *pinctrl_find_and_add_gpio_range(const char *devname,
 EXPORT_SYMBOL_GPL(pinctrl_find_and_add_gpio_range);
 
 /**
+ * pinctrl_remove_gpio_range() - remove a range of GPIOs fro a pin controller
+ * @pctldev: pin controller device to remove the range from
+ * @range: the GPIO range to remove
+ */
+void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev,
+			       struct pinctrl_gpio_range *range)
+{
+	mutex_lock(&pinctrl_mutex);
+	list_del(&range->node);
+	mutex_unlock(&pinctrl_mutex);
+}
+EXPORT_SYMBOL_GPL(pinctrl_remove_gpio_range);
+
+/**
  * pinctrl_get_group_selector() - returns the group selector for a group
  * @pctldev: the pin controller handling the group
  * @pin_group: the pin group to look up
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 36409c2..aeefb67 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -139,6 +139,8 @@  struct pinctrl_dev *of_pinctrl_get(struct device_node *np)
 }
 #endif /* CONFIG_OF */
 
+extern void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev,
+				struct pinctrl_gpio_range *range);
 extern const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev);
 extern const char *pinctrl_dev_get_devname(struct pinctrl_dev *pctldev);
 extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev);