---

yaml --- r: 372535 b: refs/heads/master c: 247127f h: refs/heads/master i: 372533: d7400b4 372531: d396f3d 372527: 4e0ae28 v: v3
git-mirror · Mar 15, 2013 · 88c10a5 · 88c10a5
1 parent 271f8e2
commit 88c10a5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 934cb02bab9003bf65afe73e9146a1ea63b26c40
+refs/heads/master: 247127f90ba1fcc234008e00e937537a89eef9ca
diff --git a/trunk/drivers/pinctrl/sh-pfc/gpio.c b/trunk/drivers/pinctrl/sh-pfc/gpio.c
@@ -220,13 +220,19 @@ 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))
 		return PTR_ERR(chip);
 
 	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/trunk/drivers/pinctrl/sh-pfc/pinctrl.c b/trunk/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;
 }