diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-07-25 00:10:11 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-25 00:10:11 -0400 |
| commit | 92f53a85db3730ae088aaeb7900f85909fd1eda6 (patch) | |
| tree | 45368c7237ee812a97579958782e43ae13f4d328 | |
| parent | bdc0077af574800d24318b6945cf2344e8dbb050 (diff) | |
sh: pfc: Build fix for pinctrl_remove_gpio_range() changes.
pinctrl_remove_gpio_range() is now handled by the pinctrl core in the
unreg path for some reason, so use that instead.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | drivers/sh/pfc/pinctrl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/sh/pfc/pinctrl.c b/drivers/sh/pfc/pinctrl.c index 0802b6c0d653..814b29255aef 100644 --- a/drivers/sh/pfc/pinctrl.c +++ b/drivers/sh/pfc/pinctrl.c | |||
| @@ -276,7 +276,6 @@ static int sh_pfc_pinconf_set(struct pinctrl_dev *pctldev, unsigned pin, | |||
| 276 | unsigned long config) | 276 | unsigned long config) |
| 277 | { | 277 | { |
| 278 | struct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev); | 278 | struct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev); |
| 279 | struct sh_pfc *pfc = pmx->pfc; | ||
| 280 | 279 | ||
| 281 | /* Validate the new type */ | 280 | /* Validate the new type */ |
| 282 | if (config >= PINMUX_FLAG_TYPE) | 281 | if (config >= PINMUX_FLAG_TYPE) |
| @@ -481,7 +480,6 @@ static int __devexit sh_pfc_pinctrl_remove(struct platform_device *pdev) | |||
| 481 | { | 480 | { |
| 482 | struct sh_pfc_pinctrl *pmx = platform_get_drvdata(pdev); | 481 | struct sh_pfc_pinctrl *pmx = platform_get_drvdata(pdev); |
| 483 | 482 | ||
| 484 | pinctrl_remove_gpio_range(pmx->pctl, &sh_pfc_gpio_range); | ||
| 485 | pinctrl_unregister(pmx->pctl); | 483 | pinctrl_unregister(pmx->pctl); |
| 486 | 484 | ||
| 487 | platform_set_drvdata(pdev, NULL); | 485 | platform_set_drvdata(pdev, NULL); |
