b43: Remove the PHY spinlock

This fixes a sparse warning about weird locking.
The spinlock is not needed, so simply remove it.
This also adds some sanity checks to the PHY and radio locking
to protect against recursive locking.

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

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index 93e5030aa6c3..e38ed0fe72e9 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -222,8 +222,6 @@ out:
 static int txpower_g_write_file(struct b43_wldev *dev,
                                 const char *buf, size_t count)
 {
-        unsigned long phy_flags;
-
         if (dev->phy.type != B43_PHYTYPE_G)
                 return -ENODEV;
         if ((count >= 4) && (memcmp(buf, "auto", 4) == 0)) {
@@ -247,12 +245,12 @@ static int txpower_g_write_file(struct b43_wldev *dev,
                         dev->phy.tx_control |= B43_TXCTL_PA2DB;
                 if (pa3db)
                         dev->phy.tx_control |= B43_TXCTL_PA3DB;
-                b43_phy_lock(dev, phy_flags);
+                b43_phy_lock(dev);
                 b43_radio_lock(dev);
                 b43_set_txpower_g(dev, &dev->phy.bbatt,
                                   &dev->phy.rfatt, dev->phy.tx_control);
                 b43_radio_unlock(dev);
-                b43_phy_unlock(dev, phy_flags);
+                b43_phy_unlock(dev);
         }
 
         return 0;