2 files changed, 6 insertions, 9 deletions

diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
index 45090d8381a2..32a9c7870a16 100644
--- a/drivers/pinctrl/sh-pfc/gpio.c
+++ b/drivers/pinctrl/sh-pfc/gpio.c
@@ -220,6 +220,7 @@ sh_pfc_add_gpiochip(struct sh_pfc *pfc, void(*setup)(struct sh_pfc_chip *))
 int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 {
         struct sh_pfc_chip *chip;
+        int ret;
 
         chip = sh_pfc_add_gpiochip(pfc, gpio_pin_setup);
         if (IS_ERR(chip))
@@ -227,6 +228,11 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 
         pfc->gpio = chip;
 
+        ret = gpiochip_add_pin_range(&chip->gpio_chip, dev_name(pfc->dev), 0, 0,
+                                     chip->gpio_chip.ngpio);
+        if (ret < 0)
+                return ret;
+
         chip = sh_pfc_add_gpiochip(pfc, gpio_function_setup);
         if (IS_ERR(chip))
                 return PTR_ERR(chip);
diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
index 78bd277c01d9..a60c317d988a 100644
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
@@ -28,7 +28,6 @@
 struct sh_pfc_pinctrl {
         struct pinctrl_dev *pctl;
         struct pinctrl_desc pctl_desc;
-        struct pinctrl_gpio_range range;
 
         struct sh_pfc *pfc;
 
@@ -377,14 +376,6 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc)
         if (IS_ERR(pmx->pctl))
                 return PTR_ERR(pmx->pctl);
 
-        pmx->range.name = DRV_NAME,
-        pmx->range.id = 0;
-        pmx->range.npins = pfc->info->nr_pins;
-        pmx->range.base = 0;
-        pmx->range.pin_base = 0;
-
-        pinctrl_add_gpio_range(pmx->pctl, &pmx->range);
-
         return 0;
 }