Skip to contentSkip to conversation

rtlwifi: Fix reusable codes in core.c

PATCH Superseded Byeoungwook Kim 2 participants 2 messages Feb 3, 2016

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 2/2 rtlwifi: Fix reusable codes in core.c

rtl_*_delay() functions were reused same codes about addr variable. So i have converted to rtl_addr_delay() from code about addr variable.

---
V2 split in separate patchs.

 drivers/net/wireless/realtek/rtlwifi/core.c | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)
drivers/net/wireless/realtek/rtlwifi/core.c +4 -24
index 05f432c..c1193d1 100644
@@ -63,18 +63,8 @@ EXPORT_SYMBOL(rtl_addr_delay);
 void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr,
 		     u32 mask, u32 data)
 {
-	if (addr == 0xfe) {
-		mdelay(50);
-	} else if (addr == 0xfd) {
-		mdelay(5);
-	} else if (addr == 0xfc) {
-		mdelay(1);
-	} else if (addr == 0xfb) {
-		udelay(50);
-	} else if (addr == 0xfa) {
-		udelay(5);
-	} else if (addr == 0xf9) {
-		udelay(1);
+	if (addr >= 0xf9 && addr <= 0xfe) {
+		rtl_addr_delay(addr);
 	} else {
 		rtl_set_rfreg(hw, rfpath, addr, mask, data);
 		udelay(1);
@@ -84,18 +74,8 @@ EXPORT_SYMBOL(rtl_rfreg_delay);
 
 void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data)
 {
-	if (addr == 0xfe) {
-		mdelay(50);
-	} else if (addr == 0xfd) {
-		mdelay(5);
-	} else if (addr == 0xfc) {
-		mdelay(1);
-	} else if (addr == 0xfb) {
-		udelay(50);
-	} else if (addr == 0xfa) {
-		udelay(5);
-	} else if (addr == 0xf9) {
-		udelay(1);
+	if (addr >= 0xf9 && addr <= 0xfe) {
+		rtl_addr_delay(addr);
 	} else {
 		rtl_set_bbreg(hw, addr, MASKDWORD, data);
 		udelay(1);
Signature · 1 line
2.5.0
Acked-by on v2 2/2
#1 lore raw
Quoted 47 lines · Byeoungwook Kim

rtl_*_delay() functions were reused same codes about addr variable. So i have converted to rtl_addr_delay() from code about addr variable.

---
V2 split in separate patchs.

  drivers/net/wireless/realtek/rtlwifi/core.c | 28 ++++------------------------
  1 file changed, 4 insertions(+), 24 deletions(-)
drivers/net/wireless/realtek/rtlwifi/core.c +2 -19
index 05f432c..c1193d1 100644
@@ -63,18 +63,8 @@ EXPORT_SYMBOL(rtl_addr_delay);
  void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr,
  		     u32 mask, u32 data)
  {
-	if (addr == 0xfe) {
-		mdelay(50);
-	} else if (addr == 0xfd) {
-		mdelay(5);
-	} else if (addr == 0xfc) {
-		mdelay(1);
-	} else if (addr == 0xfb) {
-		udelay(50);
-	} else if (addr == 0xfa) {
-		udelay(5);
-	} else if (addr == 0xf9) {
-		udelay(1);
+	if (addr >= 0xf9 && addr <= 0xfe) {
+		rtl_addr_delay(addr);
  	} else {
  		rtl_set_rfreg(hw, rfpath, addr, mask, data);
  		udelay(1);
@@ -84,18 +74,8 @@ EXPORT_SYMBOL(rtl_rfreg_delay);
 
  void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data)
  {
-	if (addr == 0xfe) {
-		mdelay(50);
-	} else if (addr == 0xfd) {
-		mdelay(5);
-	} else if (addr == 0xfc) {
-		mdelay(1);
-	} else if (addr == 0xfb) {

drivers/net/wireless/realtek/rtlwifi/core.c EXPORT_SYMBOL(rtl_rfreg_delay); · line 81

Quoted 10 lines
drivers/net/wireless/realtek/rtlwifi/core.c +2 -5
-		udelay(50);
-	} else if (addr == 0xfa) {
-		udelay(5);
-	} else if (addr == 0xf9) {
-		udelay(1);
+	if (addr >= 0xf9 && addr <= 0xfe) {
+		rtl_addr_delay(addr);
  	} else {
  		rtl_set_bbreg(hw, addr, MASKDWORD, data);
  		udelay(1);

Unlike patch 1 of 2, this one makes changes that are good. Thus

Thanks,

Larry