Messages in this thread Patch in this message | | | From | Peter Senna Tschudin <> | Subject | [PATCH V2] wireless: rtlwifi: Replace variable with a brake | Date | Sun, 22 Sep 2013 21:50:10 +0200 |
| |
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
| |