[PATCH V2] 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.

CC: Joe Perches <joe@perches.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
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(-)

diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 838a1ed..2aedd9f 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c

@@ -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;

-- 
1.8.3.1

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. :-)

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

Tested by compilation only.

CC: Joe Perches <redacted>
Signed-off-by: Peter Senna Tschudin <redacted>
---
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(-)

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

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Sun, Sep 22, 2013 at 9:56 PM, Sergei Shtylyov
[off-list ref] wrote:

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

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

quoted

Tested by compilation only.

quoted

CC: Joe Perches <joe@perches.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
  - Fix the indetation
  - Remove remaining } from removed else

quoted

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

quoted

And apply this one instead.

quoted

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.

quoted

  drivers/net/wireless/rtlwifi/efuse.c | 18 ++++++++----------
  1 file changed, 8 insertions(+), 10 deletions(-)

quoted

diff --git a/drivers/net/wireless/rtlwifi/efuse.c

b/drivers/net/wireless/rtlwifi/efuse.c
index 838a1ed..2aedd9f 100644

--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c

@@ -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)) {

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

Fixed on V3.

Thanks!

WBR, Sergei

-- 
Peter