gpio: Get rid of gpio_to_chip()

The gpio_to_chip() function refers to the global GPIO numberspace
which is a problem we want to get rid of. Get this function out
of the header and open code it into gpiolib with appropriate FIXME
notices so no new users appear in the kernel.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 41fd847387071dd3fee0c55a54fa8a864ca77b12..d6e6c751255f52ed22292431c7818620c8625e41 100644 (file)
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -325,7 +325,12 @@ static bool pinctrl_ready_for_gpio_range(unsigned gpio)
 {
        struct pinctrl_dev *pctldev;
        struct pinctrl_gpio_range *range = NULL;
-       struct gpio_chip *chip = gpio_to_chip(gpio);
+       /*
+        * FIXME: "gpio" here is a number in the global GPIO numberspace.
+        * get rid of this from the ranges eventually and get the GPIO
+        * descriptor from the gpio_chip.
+        */
+       struct gpio_chip *chip = gpiod_to_chip(gpio_to_desc(gpio));
 
        if (WARN(!chip, "no gpio_chip for gpio%i?", gpio))
                return false;
@@ -1657,7 +1662,12 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
                        }
                }
                if (gpio_num >= 0)
-                       chip = gpio_to_chip(gpio_num);
+                       /*
+                        * FIXME: gpio_num comes from the global GPIO numberspace.
+                        * we need to get rid of the range->base eventually and
+                        * get the descriptor directly from the gpio_chip.
+                        */
+                       chip = gpiod_to_chip(gpio_to_desc(gpio_num));
                else
                        chip = NULL;
                if (chip)

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index f79220f614aad8dd1e0375cb366f794687113137..22cb8c9efc1dea2b637adbb149ef7e94d8789ed6 100644 (file)
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -31,12 +31,6 @@ struct module;
 struct device_node;
 struct gpio_desc;
 
-/* caller holds gpio_lock *OR* gpio is marked as requested */
-static inline struct gpio_chip *gpio_to_chip(unsigned gpio)
-{
-       return gpiod_to_chip(gpio_to_desc(gpio));
-}
-
 /* Always use the library code for GPIO management calls,
  * or when sleeping may be involved.
  */