[PATCH] bcm43xx: opencoded locking

As many people don't seem to like the locking "obfuscation"
in the bcm43xx driver, this patch removes it.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 22 insertions, 12 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
index 6a23bdc75412..cc1ff3c6f140 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
@@ -120,12 +120,14 @@ static ssize_t bcm43xx_attr_sprom_show(struct device *dev,
                         GFP_KERNEL);
         if (!sprom)
                 return -ENOMEM;
-        bcm43xx_lock_irqsafe(bcm, flags);
+        mutex_lock(&bcm->mutex);
+        spin_lock_irqsave(&bcm->irq_lock, flags);
         err = bcm43xx_sprom_read(bcm, sprom);
         if (!err)
                 err = sprom2hex(sprom, buf, PAGE_SIZE);
         mmiowb();
-        bcm43xx_unlock_irqsafe(bcm, flags);
+        spin_unlock_irqrestore(&bcm->irq_lock, flags);
+        mutex_unlock(&bcm->mutex);
         kfree(sprom);
 
         return err;
@@ -150,10 +152,14 @@ static ssize_t bcm43xx_attr_sprom_store(struct device *dev,
         err = hex2sprom(sprom, buf, count);
         if (err)
                 goto out_kfree;
-        bcm43xx_lock_irqsafe(bcm, flags);
+        mutex_lock(&bcm->mutex);
+        spin_lock_irqsave(&bcm->irq_lock, flags);
+        spin_lock(&bcm->leds_lock);
         err = bcm43xx_sprom_write(bcm, sprom);
         mmiowb();
-        bcm43xx_unlock_irqsafe(bcm, flags);
+        spin_unlock(&bcm->leds_lock);
+        spin_unlock_irqrestore(&bcm->irq_lock, flags);
+        mutex_unlock(&bcm->mutex);
 out_kfree:
         kfree(sprom);
 
@@ -176,7 +182,7 @@ static ssize_t bcm43xx_attr_interfmode_show(struct device *dev,
         if (!capable(CAP_NET_ADMIN))
                 return -EPERM;
 
-        bcm43xx_lock_noirq(bcm);
+        mutex_lock(&bcm->mutex);
 
         switch (bcm43xx_current_radio(bcm)->interfmode) {
         case BCM43xx_RADIO_INTERFMODE_NONE:
@@ -193,7 +199,7 @@ static ssize_t bcm43xx_attr_interfmode_show(struct device *dev,
         }
         err = 0;
 
-        bcm43xx_unlock_noirq(bcm);
+        mutex_unlock(&bcm->mutex);
 
         return err ? err : count;
 
@@ -229,7 +235,8 @@ static ssize_t bcm43xx_attr_interfmode_store(struct device *dev,
                 return -EINVAL;
         }
 
-        bcm43xx_lock_irqsafe(bcm, flags);
+        mutex_lock(&bcm->mutex);
+        spin_lock_irqsave(&bcm->irq_lock, flags);
 
         err = bcm43xx_radio_set_interference_mitigation(bcm, mode);
         if (err) {
@@ -237,7 +244,8 @@ static ssize_t bcm43xx_attr_interfmode_store(struct device *dev,
                                     "supported by device\n");
         }
         mmiowb();
-        bcm43xx_unlock_irqsafe(bcm, flags);
+        spin_unlock_irqrestore(&bcm->irq_lock, flags);
+        mutex_unlock(&bcm->mutex);
 
         return err ? err : count;
 }
@@ -257,7 +265,7 @@ static ssize_t bcm43xx_attr_preamble_show(struct device *dev,
         if (!capable(CAP_NET_ADMIN))
                 return -EPERM;
 
-        bcm43xx_lock_noirq(bcm);
+        mutex_lock(&bcm->mutex);
 
         if (bcm->short_preamble)
                 count = snprintf(buf, PAGE_SIZE, "1 (Short Preamble enabled)\n");
@@ -265,7 +273,7 @@ static ssize_t bcm43xx_attr_preamble_show(struct device *dev,
                 count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble disabled)\n");
 
         err = 0;
-        bcm43xx_unlock_noirq(bcm);
+        mutex_unlock(&bcm->mutex);
 
         return err ? err : count;
 }
@@ -285,12 +293,14 @@ static ssize_t bcm43xx_attr_preamble_store(struct device *dev,
         value = get_boolean(buf, count);
         if (value < 0)
                 return value;
-        bcm43xx_lock_irqsafe(bcm, flags);
+        mutex_lock(&bcm->mutex);
+        spin_lock_irqsave(&bcm->irq_lock, flags);
 
         bcm->short_preamble = !!value;
 
         err = 0;
-        bcm43xx_unlock_irqsafe(bcm, flags);
+        spin_unlock_irqrestore(&bcm->irq_lock, flags);
+        mutex_unlock(&bcm->mutex);
 
         return err ? err : count;
 }