Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / arm / mach-footbridge / netwinder-leds.c

diff --git a/arch/arm/mach-footbridge/netwinder-leds.c b/arch/arm/mach-footbridge/netwinder-leds.c
index d91a4f4..e57102e 100644 (file)
--- a/arch/arm/mach-footbridge/netwinder-leds.c
+++ b/arch/arm/mach-footbridge/netwinder-leds.c
@@ -31,14 +31,13 @@
 static char led_state;
 static char hw_led_state;
 
-static DEFINE_SPINLOCK(leds_lock);
-extern spinlock_t gpio_lock;
+static DEFINE_RAW_SPINLOCK(leds_lock);
 
 static void netwinder_leds_event(led_event_t evt)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&leds_lock, flags);
+       raw_spin_lock_irqsave(&leds_lock, flags);
 
        switch (evt) {
        case led_start:
@@ -118,12 +117,12 @@ static void netwinder_leds_event(led_event_t evt)
                break;
        }
 
-       spin_unlock_irqrestore(&leds_lock, flags);
+       raw_spin_unlock_irqrestore(&leds_lock, flags);
 
        if  (led_state & LED_STATE_ENABLED) {
-               spin_lock_irqsave(&gpio_lock, flags);
-               gpio_modify_op(GPIO_RED_LED | GPIO_GREEN_LED, hw_led_state);
-               spin_unlock_irqrestore(&gpio_lock, flags);
+               raw_spin_lock_irqsave(&nw_gpio_lock, flags);
+               nw_gpio_modify_op(GPIO_RED_LED | GPIO_GREEN_LED, hw_led_state);
+               raw_spin_unlock_irqrestore(&nw_gpio_lock, flags);
        }
 }