evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8712: fix unnecessary elses after return/break in rtl8712_efuse.c

Browse source 
This patch fixes two unnecessary else conditions that were found by checkpatch.pl.

Signed-off-by: Serguey Parkhomovsky <sergueyparkhomovsky@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Serguey Parkhomovsky 2014-10-07 20:42:45 -07:00 • committed by Greg Kroah-Hartman
parent e92c3511b9
commit a15522c0a4
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/rtl8712/rtl8712_efuse.c
View file

@ -414,20 +414,19 @@ u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,
bResult = false; bResult = false;
} }
break; break;
} else { /* write header fail */ }
/* write header fail */
bResult = false; bResult = false;
if (0xFF == efuse_data) if (0xFF == efuse_data)
return bResult; /* nothing damaged. */ return bResult; /* nothing damaged. */
/* call rescue procedure */ /* call rescue procedure */
if (fix_header(padapter, efuse_data, efuse_addr) == if (!fix_header(padapter, efuse_data, efuse_addr))
false)
return false; /* rescue fail */ return false; /* rescue fail */
if (++repeat_times > _REPEAT_THRESHOLD_) /* fail */ if (++repeat_times > _REPEAT_THRESHOLD_) /* fail */
break; break;
/* otherwise, take another risk... */ /* otherwise, take another risk... */
} }
}
return bResult; return bResult;
} }
@ -541,7 +540,8 @@ u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts,
} }
idx++; idx++;
break; break;
} else { }
if ((data[idx] != pktdata[i]) || (data[idx+1] != if ((data[idx] != pktdata[i]) || (data[idx+1] !=
pktdata[i+1])) { pktdata[i+1])) {
word_en &= ~BIT(i >> 1); word_en &= ~BIT(i >> 1);
@ -549,7 +549,7 @@ u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts,
newdata[j++] = data[idx + 1]; newdata[j++] = data[idx + 1];
} }
idx += 2; idx += 2;
}
if (idx == cnts) if (idx == cnts)
break; break;
} }