rt2x00: Revise irqmask locking for PCI devices

[pandora-kernel.git] / drivers / net / wireless / rt2x00 / rt2500pci.c

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 0fbc18c..635f804 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1449,27 +1449,25 @@ static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev,
 static void rt2500pci_enable_interrupt(struct rt2x00_dev *rt2x00dev,
                                       struct rt2x00_field32 irq_field)
 {
-       unsigned long flags;
        u32 reg;
 
        /*
         * Enable a single interrupt. The interrupt mask register
         * access needs locking.
         */
-       spin_lock_irqsave(&rt2x00dev->irqmask_lock, flags);
+       spin_lock_irq(&rt2x00dev->irqmask_lock);
 
        rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
        rt2x00_set_field32(&reg, irq_field, 0);
        rt2x00pci_register_write(rt2x00dev, CSR8, reg);
 
-       spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags);
+       spin_unlock_irq(&rt2x00dev->irqmask_lock);
 }
 
 static void rt2500pci_txstatus_tasklet(unsigned long data)
 {
        struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
        u32 reg;
-       unsigned long flags;
 
        /*
         * Handle all tx queues.
@@ -1481,7 +1479,7 @@ static void rt2500pci_txstatus_tasklet(unsigned long data)
        /*
         * Enable all TXDONE interrupts again.
         */
-       spin_lock_irqsave(&rt2x00dev->irqmask_lock, flags);
+       spin_lock_irq(&rt2x00dev->irqmask_lock);
 
        rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
        rt2x00_set_field32(&reg, CSR8_TXDONE_TXRING, 0);
@@ -1489,7 +1487,7 @@ static void rt2500pci_txstatus_tasklet(unsigned long data)
        rt2x00_set_field32(&reg, CSR8_TXDONE_PRIORING, 0);
        rt2x00pci_register_write(rt2x00dev, CSR8, reg);
 
-       spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags);
+       spin_unlock_irq(&rt2x00dev->irqmask_lock);
 }
 
 static void rt2500pci_tbtt_tasklet(unsigned long data)
@@ -1510,7 +1508,6 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
 {
        struct rt2x00_dev *rt2x00dev = dev_instance;
        u32 reg, mask;
-       unsigned long flags;
 
        /*
         * Get the interrupt sources & saved to local variable.
@@ -1552,13 +1549,13 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
         * Disable all interrupts for which a tasklet was scheduled right now,
         * the tasklet will reenable the appropriate interrupts.
         */
-       spin_lock_irqsave(&rt2x00dev->irqmask_lock, flags);
+       spin_lock(&rt2x00dev->irqmask_lock);
 
        rt2x00pci_register_read(rt2x00dev, CSR8, &reg);
        reg |= mask;
        rt2x00pci_register_write(rt2x00dev, CSR8, reg);
 
-       spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags);
+       spin_unlock(&rt2x00dev->irqmask_lock);
 
        return IRQ_HANDLED;
 }