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

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>

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 3d5c4244c8099d8243b90d94c003768528a25646..0b134af4a9c3937aeee7e603e63ebfc9f82b4795 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -5572,13 +5572,10 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
        if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV
                        | VB_SIS302LV | VB_XGI301C)) {
                if (!(pVBInfo->SetFlag & DisableChA)) {
-                       if (pVBInfo->SetFlag & EnableChA) {
+                       if ((pVBInfo->SetFlag & EnableChA) ||
+                           (pVBInfo->VBInfo & SetCRT2ToDualEdge)) {
                                /* Power on */
                                xgifb_reg_set(pVBInfo->Part1Port, 0x1E, 0x20);
-                       } else if (pVBInfo->VBInfo & SetCRT2ToDualEdge) {
-                               /* Power on */
-                               xgifb_reg_set(pVBInfo->Part1Port,
-                                               0x1E, 0x20);
                        }
                }