diff options
| author | imp <imp@FreeBSD.org> | 2010-12-23 19:28:50 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-12-23 19:28:50 +0000 |
| commit | f21cfeb4a06a620a96d902d9ba78fe74673fe331 (patch) | |
| tree | bd0b8840b7419a9472abd5d793688ff34359d62c | |
| parent | b99e14a3c709a03c560cd1d1c29e5edc7170eb2d (diff) | |
| download | FreeBSD-src-f21cfeb4a06a620a96d902d9ba78fe74673fe331.zip FreeBSD-src-f21cfeb4a06a620a96d902d9ba78fe74673fe331.tar.gz | |
IXP4XX_GPIO_{,UN}LOCK() don't take args. Remove the sc here to make
this compile again.
| -rw-r--r-- | sys/arm/xscale/ixp425/avila_gpio.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/arm/xscale/ixp425/avila_gpio.c b/sys/arm/xscale/ixp425/avila_gpio.c index cb73001..b88bb28 100644 --- a/sys/arm/xscale/ixp425/avila_gpio.c +++ b/sys/arm/xscale/ixp425/avila_gpio.c @@ -148,7 +148,7 @@ avila_gpio_pin_configure(struct avila_gpio_softc *sc, struct gpio_pin *pin, * Manage input/output */ if (flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) { - IXP4XX_GPIO_LOCK(sc); + IXP4XX_GPIO_LOCK(); pin->gp_flags &= ~(GPIO_PIN_INPUT|GPIO_PIN_OUTPUT); if (flags & GPIO_PIN_OUTPUT) { pin->gp_flags |= GPIO_PIN_OUTPUT; @@ -158,7 +158,7 @@ avila_gpio_pin_configure(struct avila_gpio_softc *sc, struct gpio_pin *pin, pin->gp_flags |= GPIO_PIN_INPUT; GPIO_SET_BITS(sc, IXP425_GPIO_GPOER, mask); } - IXP4XX_GPIO_UNLOCK(sc); + IXP4XX_GPIO_UNLOCK(); } } @@ -190,11 +190,11 @@ avila_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags) if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & (1 << pin))) return (EINVAL); - IXP4XX_GPIO_LOCK(sc); + IXP4XX_GPIO_LOCK(); /* refresh since we do not own all the pins */ sc->sc_pins[pin].gp_flags = avila_gpio_pin_flags(sc, pin); *flags = sc->sc_pins[pin].gp_flags; - IXP4XX_GPIO_UNLOCK(sc); + IXP4XX_GPIO_UNLOCK(); return (0); } @@ -242,12 +242,12 @@ avila_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value) if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask)) return (EINVAL); - IXP4XX_GPIO_LOCK(sc); + IXP4XX_GPIO_LOCK(); if (value) GPIO_SET_BITS(sc, IXP425_GPIO_GPOUTR, mask); else GPIO_CLEAR_BITS(sc, IXP425_GPIO_GPOUTR, mask); - IXP4XX_GPIO_UNLOCK(sc); + IXP4XX_GPIO_UNLOCK(); return (0); } @@ -260,9 +260,9 @@ avila_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val) if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & (1 << pin))) return (EINVAL); - IXP4XX_GPIO_LOCK(sc); + IXP4XX_GPIO_LOCK(); *val = (GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR) & (1 << pin)) ? 1 : 0; - IXP4XX_GPIO_UNLOCK(sc); + IXP4XX_GPIO_UNLOCK(); return (0); } @@ -277,13 +277,13 @@ avila_gpio_pin_toggle(device_t dev, uint32_t pin) if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask)) return (EINVAL); - IXP4XX_GPIO_LOCK(sc); + IXP4XX_GPIO_LOCK(); res = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR) & mask; if (res) GPIO_CLEAR_BITS(sc, IXP425_GPIO_GPOUTR, mask); else GPIO_SET_BITS(sc, IXP425_GPIO_GPOUTR, mask); - IXP4XX_GPIO_UNLOCK(sc); + IXP4XX_GPIO_UNLOCK(); return (0); } |
