leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging/xgifb: Consolidate if/else if with identical code branches

Browse Source 
Both branches of this if statement execute the same code.
Thus we can || them together and remove code duplication

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Huewe 2013-02-15 20:37:09 +01:00 committed by Greg Kroah-Hartman
parent 4e9b5e2b8b
commit 66b43eb257
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/xgifb/vb_setmode.c
View File

@ -5572,13 +5572,10 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV
| VB_SIS302LV | VB_XGI301C)) { | VB_SIS302LV | VB_XGI301C)) {
if (!(pVBInfo->SetFlag & DisableChA)) { if (!(pVBInfo->SetFlag & DisableChA)) {
if (pVBInfo->SetFlag & EnableChA) { if ((pVBInfo->SetFlag & EnableChA) ||
(pVBInfo->VBInfo & SetCRT2ToDualEdge)) {
/* Power on */ /* Power on */
xgifb_reg_set(pVBInfo->Part1Port, 0x1E, 0x20); xgifb_reg_set(pVBInfo->Part1Port, 0x1E, 0x20);
} else if (pVBInfo->VBInfo & SetCRT2ToDualEdge) {
/* Power on */
xgifb_reg_set(pVBInfo->Part1Port,
0x1E, 0x20);
} }
} }