]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: xgifb: XGI_main_26.c Logical continuation
authorWalt Feasel <waltfeasel@gmail.com>
Thu, 17 Nov 2016 05:39:10 +0000 (00:39 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Nov 2016 15:34:17 +0000 (16:34 +0100)
Make suggested checkpatch modification for
CHECK: Logical continuations should be on the previous line

Signed-off-by: Walt Feasel <waltfeasel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/XGI_main_26.c

index 51b11944a3ec93900f02d0b1fe5d4858f4cec216..9218c745813fc1edf90b2e6bdd026aab407f913d 100644 (file)
@@ -231,11 +231,11 @@ static int XGIfb_GetXG21DefaultLVDSModeIdx(struct xgifb_video_info *xgifb_info)
 {
        int i = 0;
 
-       while ((XGIbios_mode[i].mode_no != 0)
-              && (XGIbios_mode[i].xres <= xgifb_info->lvds_data.LVDSHDE)) {
-               if ((XGIbios_mode[i].xres == xgifb_info->lvds_data.LVDSHDE)
-                   && (XGIbios_mode[i].yres == xgifb_info->lvds_data.LVDSVDE)
-                   && (XGIbios_mode[i].bpp == 8)) {
+       while ((XGIbios_mode[i].mode_no != 0) &&
+              (XGIbios_mode[i].xres <= xgifb_info->lvds_data.LVDSHDE)) {
+               if ((XGIbios_mode[i].xres == xgifb_info->lvds_data.LVDSHDE) &&
+                   (XGIbios_mode[i].yres == xgifb_info->lvds_data.LVDSVDE) &&
+                   (XGIbios_mode[i].bpp == 8)) {
                        return i;
                }
                i++;
@@ -384,9 +384,8 @@ static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex)
                                        return -1;
                                break;
                        case 640:
-                               if ((XGIbios_mode[myindex].yres != 400)
-                                               && (XGIbios_mode[myindex].yres
-                                                               != 480))
+                               if ((XGIbios_mode[myindex].yres != 400) &&
+                                   (XGIbios_mode[myindex].yres != 480))
                                        return -1;
                                break;
                        case 800:
@@ -1344,9 +1343,8 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var,
        if (var->vmode & FB_VMODE_YWRAP) {
                if (var->yoffset >= info->var.yres_virtual || var->xoffset)
                        return -EINVAL;
-       } else if (var->xoffset + info->var.xres > info->var.xres_virtual
-                               || var->yoffset + info->var.yres
-                                               > info->var.yres_virtual) {
+       } else if (var->xoffset + info->var.xres > info->var.xres_virtual ||
+                  var->yoffset + info->var.yres > info->var.yres_virtual) {
                return -EINVAL;
        }
        err = XGIfb_pan_var(var, info);