mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 04:34:08 +08:00
gpio: mb86s70: Revert "Return error if requesting an already assigned gpio"
Commitfd9c963c56
("gpio: mb86s70: Return error if requesting an already assigned gpio") adds code that infers from the state of the GPIO Pin Function Register (PFR) whether a GPIO has been assigned already. This assumes that the pin functions are set to 'peripheral' when the driver is loaded, which is not guaranteed. Also, the GPIO layer is perfectly capable of keeping track of which GPIOs have been assigned already, so we shouldn't need this check in the first place. This reverts commitfd9c963c56
. Cc: Axel Lin <axel.lin@ingics.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
e1289dba18
commit
eb32889928
@ -53,11 +53,6 @@ static int mb86s70_gpio_request(struct gpio_chip *gc, unsigned gpio)
|
||||
spin_lock_irqsave(&gchip->lock, flags);
|
||||
|
||||
val = readl(gchip->base + PFR(gpio));
|
||||
if (!(val & OFFSET(gpio))) {
|
||||
spin_unlock_irqrestore(&gchip->lock, flags);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
val &= ~OFFSET(gpio);
|
||||
writel(val, gchip->base + PFR(gpio));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user