8 files changed, 14 insertions, 33 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 29fc15423299..d6a8e851ad13 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -834,15 +834,6 @@ config GPIO_PCF857X
           This driver provides an in-kernel interface to those GPIOs using
           platform-neutral GPIO calls.
 
-config GPIO_SX150X
-        bool "Semtech SX150x I2C GPIO expander (deprecated)"
-        depends on PINCTRL && I2C=y
-        select PINCTRL_SX150X
-        default n
-        help
-          Say yes here to provide support for Semtech SX150x-series I2C
-          GPIO expanders. The GPIO driver was replaced by a Pinctrl version.
-
 config GPIO_TPIC2810
         tristate "TPIC2810 8-Bit I2C GPO expander"
         help
diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
index 8781817d9003..6b3ca6601af2 100644
--- a/drivers/gpio/gpio-aspeed.c
+++ b/drivers/gpio/gpio-aspeed.c
@@ -539,12 +539,12 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset)
         if (!have_gpio(gpiochip_get_data(chip), offset))
                 return -ENODEV;
 
-        return pinctrl_request_gpio(chip->base + offset);
+        return pinctrl_gpio_request(chip->base + offset);
 }
 
 static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset)
 {
-        pinctrl_free_gpio(chip->base + offset);
+        pinctrl_gpio_free(chip->base + offset);
 }
 
 static inline void __iomem *bank_debounce_reg(struct aspeed_gpio *gpio,
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index 8d32ccc980d9..b86e09e1b13b 100644
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -239,12 +239,12 @@ static int em_gio_to_irq(struct gpio_chip *chip, unsigned offset)
 
 static int em_gio_request(struct gpio_chip *chip, unsigned offset)
 {
-        return pinctrl_request_gpio(chip->base + offset);
+        return pinctrl_gpio_request(chip->base + offset);
 }
 
 static void em_gio_free(struct gpio_chip *chip, unsigned offset)
 {
-        pinctrl_free_gpio(chip->base + offset);
+        pinctrl_gpio_free(chip->base + offset);
 
         /* Set the GPIO as an input to ensure that the next GPIO request won't
         * drive the GPIO pin as an output.
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 6029899789f3..f480fb896963 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -330,16 +330,6 @@ static int pxa_gpio_of_xlate(struct gpio_chip *gc,
 }
 #endif
 
-static int pxa_gpio_request(struct gpio_chip *chip, unsigned int offset)
-{
-        return pinctrl_request_gpio(chip->base + offset);
-}
-
-static void pxa_gpio_free(struct gpio_chip *chip, unsigned int offset)
-{
-        pinctrl_free_gpio(chip->base + offset);
-}
-
 static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio,
                               struct device_node *np, void __iomem *regbase)
 {
@@ -358,8 +348,8 @@ static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio,
         pchip->chip.set = pxa_gpio_set;
         pchip->chip.to_irq = pxa_gpio_to_irq;
         pchip->chip.ngpio = ngpio;
-        pchip->chip.request = pxa_gpio_request;
-        pchip->chip.free = pxa_gpio_free;
+        pchip->chip.request = gpiochip_generic_request;
+        pchip->chip.free = gpiochip_generic_free;
 #ifdef CONFIG_OF_GPIO
         pchip->chip.of_node = np;
         pchip->chip.of_xlate = pxa_gpio_of_xlate;
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index 0ea998a3e357..e76de57dd617 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -250,7 +250,7 @@ static int gpio_rcar_request(struct gpio_chip *chip, unsigned offset)
         if (error < 0)
                 return error;
 
-        error = pinctrl_request_gpio(chip->base + offset);
+        error = pinctrl_gpio_request(chip->base + offset);
         if (error)
                 pm_runtime_put(&p->pdev->dev);
 
@@ -261,7 +261,7 @@ static void gpio_rcar_free(struct gpio_chip *chip, unsigned offset)
 {
         struct gpio_rcar_priv *p = gpiochip_get_data(chip);
 
-        pinctrl_free_gpio(chip->base + offset);
+        pinctrl_gpio_free(chip->base + offset);
 
         /*
          * Set the GPIO as an input to ensure that the next GPIO request won't
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index fbaf974277df..8db47f671708 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -141,14 +141,14 @@ static void tegra_gpio_disable(struct tegra_gpio_info *tgi, unsigned int gpio)
 
 static int tegra_gpio_request(struct gpio_chip *chip, unsigned int offset)
 {
-        return pinctrl_request_gpio(offset);
+        return pinctrl_gpio_request(offset);
 }
 
 static void tegra_gpio_free(struct gpio_chip *chip, unsigned int offset)
 {
         struct tegra_gpio_info *tgi = gpiochip_get_data(chip);
 
-        pinctrl_free_gpio(offset);
+        pinctrl_gpio_free(offset);
         tegra_gpio_disable(tgi, offset);
 }
 
diff --git a/drivers/gpio/gpio-tz1090.c b/drivers/gpio/gpio-tz1090.c
index 22c5be65051f..0bb9bb583889 100644
--- a/drivers/gpio/gpio-tz1090.c
+++ b/drivers/gpio/gpio-tz1090.c
@@ -232,7 +232,7 @@ static int tz1090_gpio_request(struct gpio_chip *chip, unsigned int offset)
         struct tz1090_gpio_bank *bank = gpiochip_get_data(chip);
         int ret;
 
-        ret = pinctrl_request_gpio(chip->base + offset);
+        ret = pinctrl_gpio_request(chip->base + offset);
         if (ret)
                 return ret;
 
@@ -246,7 +246,7 @@ static void tz1090_gpio_free(struct gpio_chip *chip, unsigned int offset)
 {
         struct tz1090_gpio_bank *bank = gpiochip_get_data(chip);
 
-        pinctrl_free_gpio(chip->base + offset);
+        pinctrl_gpio_free(chip->base + offset);
 
         tz1090_gpio_clear_bit(bank, REG_GPIO_BIT_EN, offset);
 }
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 641a5eb552cb..aad84a6306c4 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1962,7 +1962,7 @@ static inline void gpiochip_irqchip_free_valid_mask(struct gpio_chip *gpiochip)
  */
 int gpiochip_generic_request(struct gpio_chip *chip, unsigned offset)
 {
-        return pinctrl_request_gpio(chip->gpiodev->base + offset);
+        return pinctrl_gpio_request(chip->gpiodev->base + offset);
 }
 EXPORT_SYMBOL_GPL(gpiochip_generic_request);
 
@@ -1973,7 +1973,7 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_request);
  */
 void gpiochip_generic_free(struct gpio_chip *chip, unsigned offset)
 {
-        pinctrl_free_gpio(chip->gpiodev->base + offset);
+        pinctrl_gpio_free(chip->gpiodev->base + offset);
 }
 EXPORT_SYMBOL_GPL(gpiochip_generic_free);