aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/phy.h
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2008-01-09 13:08:49 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:09:32 -0500
commitf31800d8b79bc42e495070aa6e6425841b7bdcbf (patch)
tree65f26267ae5b6d3876079913330634392654af00 /drivers/net/wireless/b43/phy.h
parent5250703e3144e50fbeceb4d1fc01ea2fd159fd4a (diff)
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>
Diffstat (limited to 'drivers/net/wireless/b43/phy.h')
-rw-r--r--drivers/net/wireless/b43/phy.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/net/wireless/b43/phy.h b/drivers/net/wireless/b43/phy.h
index 4ee01d534ba1..31bd4d87b404 100644
--- a/drivers/net/wireless/b43/phy.h
+++ b/drivers/net/wireless/b43/phy.h
@@ -199,18 +199,8 @@ enum {
199#define B43_PHYVER_TYPE_SHIFT 8 199#define B43_PHYVER_TYPE_SHIFT 8
200#define B43_PHYVER_VERSION 0x00FF 200#define B43_PHYVER_VERSION 0x00FF
201 201
202void b43_raw_phy_lock(struct b43_wldev *dev); 202void b43_phy_lock(struct b43_wldev *dev);
203#define b43_phy_lock(dev, flags) \ 203void b43_phy_unlock(struct b43_wldev *dev);
204 do { \
205 local_irq_save(flags); \
206 b43_raw_phy_lock(dev); \
207 } while (0)
208void b43_raw_phy_unlock(struct b43_wldev *dev);
209#define b43_phy_unlock(dev, flags) \
210 do { \
211 b43_raw_phy_unlock(dev); \
212 local_irq_restore(flags); \
213 } while (0)
214 204
215u16 b43_phy_read(struct b43_wldev *dev, u16 offset); 205u16 b43_phy_read(struct b43_wldev *dev, u16 offset);
216void b43_phy_write(struct b43_wldev *dev, u16 offset, u16 val); 206void b43_phy_write(struct b43_wldev *dev, u16 offset, u16 val);