diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-10-27 21:21:48 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-10-31 13:13:34 +0100 |
| commit | eb3288992864616b66e6442fecfba9e3474e42c5 (patch) | |
| tree | ad1df785b559b2e318aaa2f442ce8e973437cacc /drivers/gpio/gpio-mb86s7x.c | |
| parent | e1289dba18bf905870a42b994c003586688d9353 (diff) | |
| download | linux-next-eb3288992864616b66e6442fecfba9e3474e42c5.tar.gz | |
gpio: mb86s70: Revert "Return error if requesting an already assigned gpio"
Commit fd9c963c5661 ("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 commit fd9c963c5661af3403e77e312c0d9941773b6c1b.
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>
Diffstat (limited to 'drivers/gpio/gpio-mb86s7x.c')
| -rw-r--r-- | drivers/gpio/gpio-mb86s7x.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-mb86s7x.c b/drivers/gpio/gpio-mb86s7x.c index b140806bded3..3134c0d2bfe4 100644 --- a/drivers/gpio/gpio-mb86s7x.c +++ b/drivers/gpio/gpio-mb86s7x.c @@ -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)); |