Skip to contentSkip to conversation

b43: remove final uses of b43_radio_{read|write}16 and helper defines

PATCH In review Harvey Harrison 1 participant 1 message Oct 3, 2008 Networking drivers (wireless)

lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 8/8 b43: remove final uses of b43_radio_{read|write}16 and helper defines

Signed-off-by Harvey Harrison <[email protected]>
---
 drivers/net/wireless/b43/phy_common.c  |   10 ++---
 drivers/net/wireless/b43/phy_common.h  |    2 -
 drivers/net/wireless/b43/phy_n.c       |   62 ++++++++++++++++----------------
 drivers/net/wireless/b43/tables_nphy.c |    2 +-
 drivers/net/wireless/b43/wa.c          |    5 +--
 5 files changed, 38 insertions(+), 43 deletions(-)
drivers/net/wireless/b43/phy_common.c +4 -6
index af37abc..c805fc2 100644
@@ -190,20 +190,18 @@ void b43_radio_write(struct b43_wldev *dev, u16 reg, u16 value)
 
 void b43_radio_mask(struct b43_wldev *dev, u16 offset, u16 mask)
 {
-	b43_radio_write16(dev, offset,
-			  b43_radio_read16(dev, offset) & mask);
+	b43_radio_write(dev, offset, b43_radio_read(dev, offset) & mask);
 }
 
 void b43_radio_set(struct b43_wldev *dev, u16 offset, u16 set)
 {
-	b43_radio_write16(dev, offset,
-			  b43_radio_read16(dev, offset) | set);
+	b43_radio_write(dev, offset, b43_radio_read(dev, offset) | set);
 }
 
 void b43_radio_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set)
 {
-	b43_radio_write16(dev, offset,
-			  (b43_radio_read16(dev, offset) & mask) | set);
+	b43_radio_write(dev, offset,
+			(b43_radio_read(dev, offset) & mask) | set);
 }
 
 u16 b43_phy_read(struct b43_wldev *dev, u16 reg)
drivers/net/wireless/b43/phy_common.h +0 -2
index c9f5430..a3a9d48 100644
@@ -307,13 +307,11 @@ void b43_phy_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set);
  * b43_radio_read - 16bit Radio register read access
  */
 u16 b43_radio_read(struct b43_wldev *dev, u16 reg);
-#define b43_radio_read16	b43_radio_read /* DEPRECATED */
 
 /**
  * b43_radio_write - 16bit Radio register write access
  */
 void b43_radio_write(struct b43_wldev *dev, u16 reg, u16 value);
-#define b43_radio_write16	b43_radio_write /* DEPRECATED */
 
 /**
  * b43_radio_mask - Mask a 16bit radio register with a mask
drivers/net/wireless/b43/phy_n.c +31 -31

92 lines not on this page · raw message

drivers/net/wireless/b43/tables_nphy.c +1 -1
index 4e23363..1920481 100644
@@ -286,7 +286,7 @@ void b2055_upload_inittab(struct b43_wldev *dev,
 				value = e->ghz5;
 			else
 				value = e->ghz2;
-			b43_radio_write16(dev, i, value);
+			b43_radio_write(dev, i, value);
 		}
 	}
 }
drivers/net/wireless/b43/wa.c +2 -3
index 0c0fb15..dc6653c 100644
@@ -66,7 +66,7 @@ void b43_wa_initgains(struct b43_wldev *dev)
 		b43_phy_read(dev, B43_PHY_LPFGAINCTL) & 0xFF0F);
 	if (phy->rev <= 2)
 		b43_ofdmtab_write16(dev, B43_OFDMTAB_LPFGAIN, 0, 0x1FBF);
-	b43_radio_write16(dev, 0x0002, 0x1FBF);
+	b43_radio_write(dev, 0x0002, 0x1FBF);
 
 	b43_phy_write(dev, 0x0024, 0x4680);
 	b43_phy_write(dev, 0x0020, 0x0003);

@@ -399,8 +399,7 @@ static void b43_wa_altagc(struct b43_wldev *dev)
 		(b43_phy_read(dev, B43_PHY_OFDM(0x1A)) & ~0x3F80) | 0x2B80);
 	b43_phy_write(dev, B43_PHY_ANTWRSETT,
 		(b43_phy_read(dev, B43_PHY_ANTWRSETT) & 0xF0FF) | 0x0300);
-	b43_radio_write16(dev, 0x7A,
-		b43_radio_read16(dev, 0x7A) | 0x0008);
+	b43_radio_set(dev, 0x7A, 0x0008);
 	b43_phy_write(dev, B43_PHY_N1P1GAIN,
 		(b43_phy_read(dev, B43_PHY_N1P1GAIN) & ~0x000F) | 0x0008);
 	b43_phy_write(dev, B43_PHY_P1P2GAIN,
Signature · 1 line
1.6.0.2.471.g47a76