staging: rtl8712: fix unnecessary elses after return/break in rtl8712_efuse.c
PATCH 1/1 staging: rtl8712: fix unnecessary elses after return/break in rtl8712_efuse.c
This patch fixes two unnecessary else conditions that were found by checkpatch.pl.
Signed-off-by Serguey Parkhomovsky <[email protected]>
--- drivers/staging/rtl8712/rtl8712_efuse.c | 41 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 20 deletions(-)
drivers/staging/rtl8712/rtl8712_efuse.c +21 -20
@@ -414,19 +414,19 @@ u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset, bResult = false; }break ; - }else {/* write header fail */ - bResult = false; -if (0xFF == efuse_data) -return bResult;/* nothing damaged. */ -/* call rescue procedure */ -if (fix_header (padapter, efuse_data, efuse_addr) == - false) -return false;/* rescue fail */ - -if (++repeat_times > _REPEAT_THRESHOLD_)/* fail */ -break ; -/* otherwise, take another risk... */ } +/* write header fail */ + bResult = false; +if (0xFF == efuse_data) +return bResult;/* nothing damaged. */ +/* call rescue procedure */ +if (fix_header (padapter, efuse_data, efuse_addr) == + false) +return false;/* rescue fail */ + +if (++repeat_times > _REPEAT_THRESHOLD_)/* fail */ +break ; +/* otherwise, take another risk... */ }return bResult; }
@@ -541,15 +541,16 @@ u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts, } idx++;break ; - }else { -if ((data[idx] != pktdata[i]) || (data[idx+1 ] != - pktdata[i+1 ])) { - word_en &= ~BIT (i >>1 ); - newdata[j++] = data[idx]; - newdata[j++] = data[idx +1 ]; - } - idx +=2 ; } + +if ((data[idx] != pktdata[i]) || (data[idx+1 ] != + pktdata[i+1 ])) { + word_en &= ~BIT (i >>1 ); + newdata[j++] = data[idx]; + newdata[j++] = data[idx +1 ]; + } + idx +=2 ; +if (idx == cnts)break ; }
Signature · 1 line
1.9.3
Quoted 1 line · Serguey Parkhomovsky
This patch fixes two unnecessary else conditions that were found by checkpatch.pl.
[]
drivers/staging/rtl8712/rtl8712_efuse.c
Quoted 1 line
drivers/staging/rtl8712/rtl8712_efuse.c +0
-0
[]
drivers/staging/rtl8712/rtl8712_efuse.c u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,
Quoted 1 line
drivers/staging/rtl8712/rtl8712_efuse.c +0
-0@@ -414,19 +414,19 @@ u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,
[]
drivers/staging/rtl8712/rtl8712_efuse.c u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset, · line 425
Quoted 4 lines
drivers/staging/rtl8712/rtl8712_efuse.c +4
-0+/* call rescue procedure */ +if (fix_header (padapter, efuse_data, efuse_addr) == + false) +return false;/* rescue fail */
Probably better as:
if (!fix_header(padapter, efuse_data, efuse_addr))
return false; /* rescue fail */