Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1524098

[PATCH v2 3/7] staging: xgifb: XGI_main_26.c Logical continuation

Show all headers | View raw

Make suggested checkpatch modification for
CHECK: Logical continuations should be on the previous line

Signed-off-by: Walt Feasel <waltfeasel@gmail.com>
---
v2 makes changes to correct for email format patch submission

 drivers/staging/xgifb/XGI_main_26.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 51b1194..9218c74 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -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);
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/7] staging: xgifb: XGI_main_26.c checkpatch modifications Walt Feasel <waltfeasel@gmail.com> - 2016-11-17 06:40 +0100
  [PATCH v2 6/7] staging: xgifb: XGI_main_26.c Blank line before } Walt Feasel <waltfeasel@gmail.com> - 2016-11-17 06:50 +0100
  [PATCH v2 7/7] staging: xgifb: XGI_main_26.c Align match parenthesis Walt Feasel <waltfeasel@gmail.com> - 2016-11-17 06:50 +0100
  [PATCH v2 5/7] staging: xgifb: XGI_main_26.c Blank line after { Walt Feasel <waltfeasel@gmail.com> - 2016-11-17 06:50 +0100
  [PATCH v2 3/7] staging: xgifb: XGI_main_26.c Logical continuation Walt Feasel <waltfeasel@gmail.com> - 2016-11-17 06:50 +0100
  [PATCH v2 1/7] staging: xgifb: XGI_main_26.c Comment style modifications Walt Feasel <waltfeasel@gmail.com> - 2016-11-17 06:50 +0100
  [PATCH v2 2/7] staging: xgifb: XGI_main_26.c No space after cast Walt Feasel <waltfeasel@gmail.com> - 2016-11-17 06:50 +0100
  [PATCH v2 4/7] staging: xgifb: XGI_main_26.c Space around operator Walt Feasel <waltfeasel@gmail.com> - 2016-11-17 06:50 +0100

csiph-web