Staging: xgifb: Rework some conditions in XGI_SetCRT2ModeRegs().

Rework some conditions to reduce indentation and fix style warnings.

Signed-off-by: Miguel Gómez <magomez@igalia.com>
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 53135c54596522aade00f511e6227f28c5ff3df5..01a3ef394ba0f897882050d5ad9973e1575336f3 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -5990,60 +5990,49 @@ static void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
        tempah = 0x08;
        tempbl = 0xf0;
 
-       if (pVBInfo->VBInfo & DisableCRT2Display) {
-               xgifb_reg_and_or(pVBInfo->Part1Port, 0x2e, tempbl, tempah);
-       } else {
-               tempah = 0x00;
-               tempbl = 0xff;
+       if (pVBInfo->VBInfo & DisableCRT2Display)
+               goto reg_and_or;
 
-               if (pVBInfo->VBInfo & (SetCRT2ToRAMDAC | SetCRT2ToTV
-                               | SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
-                       if ((pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) &&
-                           (!(pVBInfo->VBInfo & SetSimuScanMode))) {
-                               tempbl &= 0xf7;
-                               tempah |= 0x01;
-                               xgifb_reg_and_or(pVBInfo->Part1Port, 0x2e,
-                                               tempbl, tempah);
-                       } else {
-                               if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
-                                       tempbl &= 0xf7;
-                                       tempah |= 0x01;
-                               }
+       tempah = 0x00;
+       tempbl = 0xff;
 
-                               if (pVBInfo->VBInfo &
-                                   (SetCRT2ToRAMDAC |
-                                    SetCRT2ToTV |
-                                    SetCRT2ToLCD)) {
-                                       tempbl &= 0xf8;
-                                       tempah = 0x01;
+       if (!(pVBInfo->VBInfo & (SetCRT2ToRAMDAC | SetCRT2ToTV |
+                                SetCRT2ToLCD | XGI_SetCRT2ToLCDA)))
+               goto reg_and_or;
 
-                                       if (!(pVBInfo->VBInfo & SetInSlaveMode))
-                                               tempah |= 0x02;
+       if ((pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) &&
+           (!(pVBInfo->VBInfo & SetSimuScanMode))) {
+               tempbl &= 0xf7;
+               tempah |= 0x01;
+               goto reg_and_or;
+       }
 
-                                       if (!(pVBInfo->VBInfo &
-                                             SetCRT2ToRAMDAC)) {
-                                               tempah = tempah ^ 0x05;
-                                               if (!(pVBInfo->VBInfo &
-                                                     SetCRT2ToLCD))
-                                                       tempah = tempah ^ 0x01;
-                                       }
+       if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
+               tempbl &= 0xf7;
+               tempah |= 0x01;
+       }
 
-                                       if (!(pVBInfo->VBInfo &
-                                             SetCRT2ToDualEdge))
-                                               tempah |= 0x08;
-                                       xgifb_reg_and_or(pVBInfo->Part1Port,
-                                                       0x2e, tempbl, tempah);
-                               } else {
-                                       xgifb_reg_and_or(pVBInfo->Part1Port,
-                                                       0x2e, tempbl, tempah);
-                               }
-                       }
-               } else {
-                       xgifb_reg_and_or(pVBInfo->Part1Port, 0x2e, tempbl,
-                                       tempah);
-               }
+       if (!(pVBInfo->VBInfo & (SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD)))
+               goto reg_and_or;
+
+       tempbl &= 0xf8;
+       tempah = 0x01;
+
+       if (!(pVBInfo->VBInfo & SetInSlaveMode))
+               tempah |= 0x02;
+
+       if (!(pVBInfo->VBInfo & SetCRT2ToRAMDAC)) {
+               tempah = tempah ^ 0x05;
+               if (!(pVBInfo->VBInfo & SetCRT2ToLCD))
+                       tempah = tempah ^ 0x01;
        }
 
+       if (!(pVBInfo->VBInfo & SetCRT2ToDualEdge))
+               tempah |= 0x08;
+
+reg_and_or:
+       xgifb_reg_and_or(pVBInfo->Part1Port, 0x2e, tempbl, tempah);
+
        if (pVBInfo->VBInfo & (SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD
                        | XGI_SetCRT2ToLCDA)) {
                tempah &= (~0x08);