diff options
author | loos <loos@FreeBSD.org> | 2015-02-14 21:16:19 +0000 |
---|---|---|
committer | loos <loos@FreeBSD.org> | 2015-02-14 21:16:19 +0000 |
commit | a7a8c39e00df26eda21597ddbe0f587ced4375a8 (patch) | |
tree | a2bdaaa92bec82c663e0a841ddfdce165ac2ebf1 /sys/arm/xscale/ixp425/avila_gpio.c | |
parent | fd8cd0a9634bc701a7e4e2431a43432b23767400 (diff) | |
download | FreeBSD-src-a7a8c39e00df26eda21597ddbe0f587ced4375a8.zip FreeBSD-src-a7a8c39e00df26eda21597ddbe0f587ced4375a8.tar.gz |
MFC r274670, r274671, r276168:
Moves all the duplicate code to a single function.
Verify for invalid modes and unwanted flags before pass the new flags to
driver.
Make gpio_default_map_gpios() static. No functional changes.
Improves the GPIO API description a little bit.
gpio_pin_max must return the maximum supported pin number and not the total
number of pins on the system.
Diffstat (limited to 'sys/arm/xscale/ixp425/avila_gpio.c')
-rw-r--r-- | sys/arm/xscale/ixp425/avila_gpio.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/arm/xscale/ixp425/avila_gpio.c b/sys/arm/xscale/ixp425/avila_gpio.c index 48f970d..4a2d1e9 100644 --- a/sys/arm/xscale/ixp425/avila_gpio.c +++ b/sys/arm/xscale/ixp425/avila_gpio.c @@ -220,16 +220,8 @@ avila_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags) if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask)) return (EINVAL); - /* Check for unwanted flags. */ - if ((flags & sc->sc_pins[pin].gp_caps) != flags) - return (EINVAL); - - /* Can't mix input/output together */ - if ((flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) == - (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) - return (EINVAL); - avila_gpio_pin_configure(sc, &sc->sc_pins[pin], flags); + return (0); } |