Merge branch 'stable/for-linus-3.6' into linux-next

[karo-tx-linux.git] / drivers / staging / xgifb / XGI_main_26.c

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index c1aa0375680fa80bc6e0a8ad25cce51d74262dbb..64ffd70eb7dcf2da0eb179bfac4f12b138a3e9b3 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -305,7 +305,7 @@ invalid_mode:
 static void XGIfb_search_vesamode(struct xgifb_video_info *xgifb_info,
                                  unsigned int vesamode)
 {
-       int i = 0, j = 0;
+       int i = 0;
 
        if (vesamode == 0)
                goto invalid;
@@ -316,15 +316,13 @@ static void XGIfb_search_vesamode(struct xgifb_video_info *xgifb_info,
                if ((XGIbios_mode[i].vesa_mode_no_1 == vesamode) ||
                    (XGIbios_mode[i].vesa_mode_no_2 == vesamode)) {
                        xgifb_info->mode_idx = i;
-                       j = 1;
-                       break;
+                       return;
                }
                i++;
        }
 
 invalid:
-       if (!j)
-               pr_info("Invalid VESA mode 0x%x'\n", vesamode);
+       pr_info("Invalid VESA mode 0x%x'\n", vesamode);
 }
 
 static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex)
@@ -592,7 +590,8 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info,
                                                <= 2) && (XGIfb_vrate[i].idx
                                                != 1)) {
                                        pr_debug("Adjusting rate from %d down to %d\n",
-                                                rate, XGIfb_vrate[i-1].refresh);
+                                                rate,
+                                                XGIfb_vrate[i-1].refresh);
                                        xgifb_info->rate_idx =
                                                XGIfb_vrate[i - 1].idx;
                                        xgifb_info->refresh_rate =
@@ -974,8 +973,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
                vtotal <<= 1;
        else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE)
                vtotal <<= 2;
-       else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
-       }
 
        if (!htotal || !vtotal) {
                pr_debug("Invalid 'var' information\n");