pinctrl core.c diff linux-4.5.5 linux-4.6

--- /usr/src/linux-4.6/drivers/pinctrl/core.c	2016-05-16 00:43:13.000000000 +0200
+++ /usr/src/linux-4.5.5/drivers/pinctrl/core.c	2016-05-19 03:35:34.000000000 +0200
@@ -481,12 +481,18 @@
 }
 EXPORT_SYMBOL_GPL(pinctrl_get_group_pins);

+/**
+ * pinctrl_find_gpio_range_from_pin() - locate the GPIO range for a pin
+ * @pctldev: the pin controller device to look in
+ * @pin: a controller-local number to find the range for
+ */
 struct pinctrl_gpio_range *
-pinctrl_find_gpio_range_from_pin_nolock(struct pinctrl_dev *pctldev,
-					unsigned int pin)
+pinctrl_find_gpio_range_from_pin(struct pinctrl_dev *pctldev,
+				 unsigned int pin)
 {
 	struct pinctrl_gpio_range *range;

+	mutex_lock(&pctldev->mutex);
 	/* Loop over the ranges */
 	list_for_each_entry(range, &pctldev->gpio_ranges, node) {
 		/* Check if we're in the valid range */
@@ -494,32 +500,15 @@
 			int a;
 			for (a = 0; a < range->npins; a++) {
 				if (range->pins[a] == pin)
-					return range;
+					goto out;
 			}
 		} else if (pin >= range->pin_base &&
 			   pin < range->pin_base + range->npins)
-			return range;
+			goto out;
 	}
-
-	return NULL;
-}
-EXPORT_SYMBOL_GPL(pinctrl_find_gpio_range_from_pin_nolock);
-
-/**
- * pinctrl_find_gpio_range_from_pin() - locate the GPIO range for a pin
- * @pctldev: the pin controller device to look in
- * @pin: a controller-local number to find the range for
- */
-struct pinctrl_gpio_range *
-pinctrl_find_gpio_range_from_pin(struct pinctrl_dev *pctldev,
-				 unsigned int pin)
-{
-	struct pinctrl_gpio_range *range;
-
-	mutex_lock(&pctldev->mutex);
-	range = pinctrl_find_gpio_range_from_pin_nolock(pctldev, pin);
+	range = NULL;
+out:
 	mutex_unlock(&pctldev->mutex);
-
 	return range;
 }
 EXPORT_SYMBOL_GPL(pinctrl_find_gpio_range_from_pin);