b43legacy: 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, 7 insertions, 9 deletions

diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index 8352a4e1cfc9..93419adb925e 100644
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -415,7 +415,6 @@ struct b43legacy_phy {
         u8 calibrated:1;
         u8 radio_rev;           /* Radio revision */
 
-        bool locked;            /* Only used in b43legacy_phy_{un}lock() */
         bool dyn_tssi_tbl;      /* tssi2dbm is kmalloc()ed. */
 
         /* ACI (adjacent channel interference) flags. */
@@ -458,11 +457,6 @@ struct b43legacy_phy {
         s16 lna_gain;           /* LNA */
         s16 pga_gain;           /* PGA */
 
-        /* PHY lock for core.rev < 3
-         * This lock is only used by b43legacy_phy_{un}lock()
-         */
-        spinlock_t lock;
-
         /* Desired TX power level (in dBm). This is set by the user and
          * adjusted in b43legacy_phy_xmitpower(). */
         u8 power_level;
@@ -486,9 +480,6 @@ struct b43legacy_phy {
                 u16 txpwr_offset;
         };
 
-#ifdef CONFIG_B43LEGACY_DEBUG
-        bool manual_txpower_control; /* Manual TX-power control enabled? */
-#endif
         /* Current Interference Mitigation mode */
         int interfmode;
         /* Stack of saved values from the Interference Mitigation code.
@@ -516,6 +507,13 @@ struct b43legacy_phy {
 
         /* PHY TX errors counter. */
         atomic_t txerr_cnt;
+
+#if B43legacy_DEBUG
+        /* Manual TX-power control enabled? */
+        bool manual_txpower_control;
+        /* PHY registers locked by b43legacy_phy_lock()? */
+        bool phy_locked;
+#endif /* B43legacy_DEBUG */
 };
 
 /* Data structures for DMA transmission, per 80211 core. */