[PATCH] sh: pfc: Fix build issues in pinctrl.c

From: Rafael J. Wysocki
Date: Fri Jul 27 2012 - 18:01:10 EST



First off, drivers/sh/pfc/pinctrl.c doesn't build after commit
5d589b0 (pinctrl: remove pinctrl_remove_gpio_range), because
sh_pfc_pinctrl_remove() uses the function that has been removed by
that commit. Fix this by removing the pinctrl_remove_gpio_range()
call, which is not necessary any more, from sh_pfc_pinctrl_remove().

Second, the compiler complains correctly that there's an unused
local variable in sh_pfc_pinconf_set(). Fix this by removing the
definition of that variable.

Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
---
drivers/sh/pfc/pinctrl.c | 2 --
1 file changed, 2 deletions(-)

Index: linux/drivers/sh/pfc/pinctrl.c
===================================================================
--- linux.orig/drivers/sh/pfc/pinctrl.c
+++ linux/drivers/sh/pfc/pinctrl.c
@@ -276,7 +276,6 @@ static int sh_pfc_pinconf_set(struct pin
unsigned long config)
{
struct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev);
- struct sh_pfc *pfc = pmx->pfc;

/* Validate the new type */
if (config >= PINMUX_FLAG_TYPE)
@@ -481,7 +480,6 @@ static int __devexit sh_pfc_pinctrl_remo
{
struct sh_pfc_pinctrl *pmx = platform_get_drvdata(pdev);

- pinctrl_remove_gpio_range(pmx->pctl, &sh_pfc_gpio_range);
pinctrl_unregister(pmx->pctl);

platform_set_drvdata(pdev, NULL);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/