Skip to content

Commit

Permalink
sh-pfc: Don't needlessly check GPIO type in sh_gpio_free()
Browse files Browse the repository at this point in the history
The GPIO type is always PINMUX_TYPE_FUNCTION when freeing a function
GPIO. Hardcode the type value.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Laurent Pinchart committed Mar 15, 2013
1 parent 2119f7c commit 24d6b36
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/pinctrl/sh-pfc/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,13 @@ static void sh_gpio_free(struct gpio_chip *gc, unsigned offset)
{
struct sh_pfc *pfc = gpio_to_pfc(gc);
unsigned long flags;
int pinmux_type;

if (offset < pfc->info->nr_pins)
return pinctrl_free_gpio(offset);

spin_lock_irqsave(&pfc->lock, flags);

pinmux_type = pfc->info->gpios[offset].flags & PINMUX_FLAG_TYPE;

sh_pfc_config_gpio(pfc, offset, pinmux_type, GPIO_CFG_FREE);
sh_pfc_config_gpio(pfc, offset, PINMUX_TYPE_FUNCTION, GPIO_CFG_FREE);

spin_unlock_irqrestore(&pfc->lock, flags);
}
Expand Down

0 comments on commit 24d6b36

Please sign in to comment.