Skip to contentSkip to conversation

wireless: rtlwifi: Replace variable with a brake

PATCH Superseded Peter Senna Tschudin 2 participants 3 messages Sep 22, 2013

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 wireless: rtlwifi: Replace variable with a brake

This patch removes the variable continual, and change the while loop to break when efuse_data = 0xFF.

Tested by compilation only.

---
Changes from V1:
- Fix the indetation
- Remove remaining } from removed else

Please ignore the patch:
[PATCH 12/19] wireless: Change variable type to bool

And apply this one instead.

The variable continual was declared as int, but was used as bool. I sent previous patch changing the variable type to bool, but Joe Perches proposed that removing the variable and adding a brake would be better.

 drivers/net/wireless/rtlwifi/efuse.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/net/wireless/rtlwifi/efuse.c +8 -10
index 838a1ed..2aedd9f 100644
@@ -1203,20 +1203,18 @@ static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
 
 static u16 efuse_get_current_size(struct ieee80211_hw *hw)
 {
-	int continual = true;
 	u16 efuse_addr = 0;
 	u8 hworden;
 	u8 efuse_data, word_cnts;
 
-	while (continual && efuse_one_byte_read(hw, efuse_addr, &efuse_data)
-	       && (efuse_addr < EFUSE_MAX_SIZE)) {
-		if (efuse_data != 0xFF) {
-			hworden = efuse_data & 0x0F;
-			word_cnts = efuse_calculate_word_cnts(hworden);
-			efuse_addr = efuse_addr + (word_cnts * 2) + 1;
-		} else {
-			continual = false;
-		}
+	while (efuse_one_byte_read(hw, efuse_addr, &efuse_data) &&
+					(efuse_addr < EFUSE_MAX_SIZE)) {
+		if (efuse_data = 0xFF)
+			break;
+
+		hworden = efuse_data & 0x0F;
+		word_cnts = efuse_calculate_word_cnts(hworden);
+		efuse_addr = efuse_addr + (word_cnts * 2) + 1;
 	}
 
 	return efuse_addr;
Signature · 1 line
1.8.3.1
#1 lore raw

Hello.

On 09/22/2013 11:50 PM, Peter Senna Tschudin wrote:

You have a typo in the subject -- "brake" is a device to stop a vehicle. :-)

Quoted 38 lines

This patch removes the variable continual, and change the while loop to break when efuse_data = 0xFF.

Tested by compilation only.

---
Changes from V1:
- Fix the indetation
- Remove remaining } from removed else

Please ignore the patch:
[PATCH 12/19] wireless: Change variable type to bool

And apply this one instead.

The variable continual was declared as int, but was used as bool. I sent previous patch changing the variable type to bool, but Joe Perches proposed that removing the variable and adding a brake would be better.

  drivers/net/wireless/rtlwifi/efuse.c | 18 ++++++++----------
  1 file changed, 8 insertions(+), 10 deletions(-)
drivers/net/wireless/rtlwifi/efuse.c +0 -2
index 838a1ed..2aedd9f 100644
@@ -1203,20 +1203,18 @@ static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
 
  static u16 efuse_get_current_size(struct ieee80211_hw *hw)
  {
-	int continual = true;
  	u16 efuse_addr = 0;
  	u8 hworden;
  	u8 efuse_data, word_cnts;
 
-	while (continual && efuse_one_byte_read(hw, efuse_addr, &efuse_data)

drivers/net/wireless/rtlwifi/efuse.c static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate) · line 1211

Quoted 10 lines
drivers/net/wireless/rtlwifi/efuse.c +2 -8
-	       && (efuse_addr < EFUSE_MAX_SIZE)) {
-		if (efuse_data != 0xFF) {
-			hworden = efuse_data & 0x0F;
-			word_cnts = efuse_calculate_word_cnts(hworden);
-			efuse_addr = efuse_addr + (word_cnts * 2) + 1;
-		} else {
-			continual = false;
-		}
+	while (efuse_one_byte_read(hw, efuse_addr, &efuse_data) &&
+					(efuse_addr < EFUSE_MAX_SIZE)) {

Start this line under efuse_one_byte_read, please. Also, parens are not
needed.

WBR, Sergei

#2 lore raw
Quoted 6 lines · Sergei Shtylyov

Hello.

On 09/22/2013 11:50 PM, Peter Senna Tschudin wrote:

You have a typo in the subject -- "brake" is a device to stop a vehicle.
:-)

Thanks, there was other similar typo after ---

Quoted 48 lines
Quoted 48 lines

This patch removes the variable continual, and change the while loop to break when efuse_data = 0xFF.

Tested by compilation only.

---
Changes from V1:
- Fix the indetation
- Remove remaining } from removed else

Please ignore the patch:
[PATCH 12/19] wireless: Change variable type to bool

And apply this one instead.

The variable continual was declared as int, but was used as bool. I sent previous patch changing the variable type to bool, but Joe Perches proposed that removing the variable and adding a brake would be better.

  drivers/net/wireless/rtlwifi/efuse.c | 18 ++++++++----------
  1 file changed, 8 insertions(+), 10 deletions(-)
drivers/net/wireless/rtlwifi/efuse.c +0 -1
index 838a1ed..2aedd9f 100644
@@ -1203,20 +1203,18 @@ static void efuse_power_switch(struct ieee80211_hw
 *hw, u8 write, u8 pwrstate)
 
  static u16 efuse_get_current_size(struct ieee80211_hw *hw)
  {
-       int continual = true;
        u16 efuse_addr = 0;
        u8 hworden;
        u8 efuse_data, word_cnts;
 
Quoted 16 lines

drivers/net/wireless/rtlwifi/efuse.c static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate) · line 1211

Quoted 12 lines
drivers/net/wireless/rtlwifi/efuse.c +2 -9
-       while (continual && efuse_one_byte_read(hw, efuse_addr,
 &efuse_data)
-              && (efuse_addr < EFUSE_MAX_SIZE)) {
-               if (efuse_data != 0xFF) {
-                       hworden = efuse_data & 0x0F;
-                       word_cnts = efuse_calculate_word_cnts(hworden);
-                       efuse_addr = efuse_addr + (word_cnts * 2) + 1;
-               } else {
-                       continual = false;
-               }
+       while (efuse_one_byte_read(hw, efuse_addr, &efuse_data) &&
+                                       (efuse_addr < EFUSE_MAX_SIZE)) {

Start this line under efuse_one_byte_read, please. Also, parens are not
needed.

Fixed on V3.

Thanks!

Quoted 3 lines

WBR, Sergei

Signature · 1 line
Peter