b43: remove SHM spinlock

This removes the SHM spinlock.
SHM is protected by wl->mutex.

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

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index bf23a3a863fa..8f64943e3f60 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -125,7 +125,6 @@ static int shm16write__write_file(struct b43_wldev *dev,
         unsigned int routing, addr, mask, set;
         u16 val;
         int res;
-        unsigned long flags;
 
         res = sscanf(buf, "0x%X 0x%X 0x%X 0x%X",
                      &routing, &addr, &mask, &set);
@@ -142,15 +141,13 @@ static int shm16write__write_file(struct b43_wldev *dev,
         if ((mask > 0xFFFF) || (set > 0xFFFF))
                 return -E2BIG;
 
-        spin_lock_irqsave(&dev->wl->shm_lock, flags);
         if (mask == 0)
                 val = 0;
         else
-                val = __b43_shm_read16(dev, routing, addr);
+                val = b43_shm_read16(dev, routing, addr);
         val &= mask;
         val |= set;
-        __b43_shm_write16(dev, routing, addr, val);
-        spin_unlock_irqrestore(&dev->wl->shm_lock, flags);
+        b43_shm_write16(dev, routing, addr, val);
 
         return 0;
 }
@@ -204,7 +201,6 @@ static int shm32write__write_file(struct b43_wldev *dev,
         unsigned int routing, addr, mask, set;
         u32 val;
         int res;
-        unsigned long flags;
 
         res = sscanf(buf, "0x%X 0x%X 0x%X 0x%X",
                      &routing, &addr, &mask, &set);
@@ -221,15 +217,13 @@ static int shm32write__write_file(struct b43_wldev *dev,
         if ((mask > 0xFFFFFFFF) || (set > 0xFFFFFFFF))
                 return -E2BIG;
 
-        spin_lock_irqsave(&dev->wl->shm_lock, flags);
         if (mask == 0)
                 val = 0;
         else
-                val = __b43_shm_read32(dev, routing, addr);
+                val = b43_shm_read32(dev, routing, addr);
         val &= mask;
         val |= set;
-        __b43_shm_write32(dev, routing, addr, val);
-        spin_unlock_irqrestore(&dev->wl->shm_lock, flags);
+        b43_shm_write32(dev, routing, addr, val);
 
         return 0;
 }