svn commit: r216681 - head/sys/arm/xscale/ixp425

[Warner Losh]

Author: imp
Date: Thu Dec 23 19:28:50 2010
New Revision: 216681
URL: http://svn.freebsd.org/changeset/base/216681

Log:
  IXP4XX_GPIO_{,UN}LOCK() don't take args.  Remove the sc here to make
  this compile again.

Modified:
  head/sys/arm/xscale/ixp425/avila_gpio.c

Modified: head/sys/arm/xscale/ixp425/avila_gpio.c
==============================================================================
--- head/sys/arm/xscale/ixp425/avila_gpio.c     Thu Dec 23 18:50:14 2010        
(r216680)
+++ head/sys/arm/xscale/ixp425/avila_gpio.c     Thu Dec 23 19:28:50 2010        
(r216681)
@@ -148,7 +148,7 @@ avila_gpio_pin_configure(struct avila_gp
         * 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_gp
                        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, ui
        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_
        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_
        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, uint
        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);
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"