Staging: xgifb: Refactor XGI_GetCRT2ResInfo().

Use a goto to remove one level of indentation, fixing 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 9dfc2deacd0a87359e9191aad4f2b554b9457c08..a7ba99f42a682f87dbbc0f1ba6587752536f5a37 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -3263,46 +3263,47 @@ static void XGI_GetCRT2ResInfo(unsigned short ModeNo,
        if (modeflag & DoubleScanMode)
                yres *= 2;
 
-       if (pVBInfo->VBInfo & SetCRT2ToLCD) {
-               if (pVBInfo->IF_DEF_LVDS == 0) {
-                       if (pVBInfo->LCDResInfo == Panel_1600x1200) {
-                               if (!(pVBInfo->LCDInfo & XGI_LCDVESATiming)) {
-                                       if (yres == 1024)
-                                               yres = 1056;
-                               }
+       if (!(pVBInfo->VBInfo & SetCRT2ToLCD))
+               goto exit;
+
+       if (pVBInfo->IF_DEF_LVDS == 0) {
+               if (pVBInfo->LCDResInfo == Panel_1600x1200) {
+                       if (!(pVBInfo->LCDInfo & XGI_LCDVESATiming)) {
+                               if (yres == 1024)
+                                       yres = 1056;
                        }
+               }
 
-                       if (pVBInfo->LCDResInfo == Panel_1280x1024) {
-                               if (yres == 400)
-                                       yres = 405;
-                               else if (yres == 350)
-                                       yres = 360;
+               if (pVBInfo->LCDResInfo == Panel_1280x1024) {
+                       if (yres == 400)
+                               yres = 405;
+                       else if (yres == 350)
+                               yres = 360;
 
-                               if (pVBInfo->LCDInfo & XGI_LCDVESATiming) {
-                                       if (yres == 360)
-                                               yres = 375;
-                               }
+                       if (pVBInfo->LCDInfo & XGI_LCDVESATiming) {
+                               if (yres == 360)
+                                       yres = 375;
                        }
+               }
 
-                       if (pVBInfo->LCDResInfo == Panel_1024x768) {
-                               if (!(pVBInfo->LCDInfo & XGI_LCDVESATiming)) {
-                                       if (!(pVBInfo->LCDInfo
-                                                       & LCDNonExpanding)) {
-                                               if (yres == 350)
-                                                       yres = 357;
-                                               else if (yres == 400)
-                                                       yres = 420;
-                                               else if (yres == 480)
-                                                       yres = 525;
-                                       }
+               if (pVBInfo->LCDResInfo == Panel_1024x768) {
+                       if (!(pVBInfo->LCDInfo & XGI_LCDVESATiming)) {
+                               if (!(pVBInfo->LCDInfo & LCDNonExpanding)) {
+                                       if (yres == 350)
+                                               yres = 357;
+                                       else if (yres == 400)
+                                               yres = 420;
+                                       else if (yres == 480)
+                                               yres = 525;
                                }
                        }
                }
-
-               if (xres == 720)
-                       xres = 640;
        }
 
+       if (xres == 720)
+               xres = 640;
+
+exit:
        pVBInfo->VGAHDE = xres;
        pVBInfo->HDE = xres;
        pVBInfo->VGAVDE = yres;