Skip to contentSkip to conversation

video: intelfbdrv.c fix sparse return void expression warnings

PATCH Applied Harvey Harrison 1 participant 1 message Apr 3, 2008 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 4/7 video: intelfbdrv.c fix sparse return void expression warnings

drivers/video/intelfb/intelfbdrv.c:1484:3: warning: returning void-valued expression drivers/video/intelfb/intelfbdrv.c:1512:3: warning: returning void-valued expression drivers/video/intelfb/intelfbdrv.c:1531:3: warning: returning void-valued expression drivers/video/intelfb/intelfbdrv.c:1545:3: warning: returning void-valued expression

---
 drivers/video/intelfb/intelfbdrv.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
drivers/video/intelfb/intelfbdrv.c +14 -8
index 481d58f..94c3ed0 100644
@@ -1480,8 +1480,10 @@ static void intelfb_fillrect (struct fb_info *info,
 	DBG_MSG("intelfb_fillrect\n");
 #endif
 
-	if (!ACCEL(dinfo, info) || dinfo->depth == 4)
-		return cfb_fillrect(info, rect);
+	if (!ACCEL(dinfo, info) || dinfo->depth == 4) {
+		cfb_fillrect(info, rect);
+		return;
+	}
 
 	if (rect->rop == ROP_COPY)
 		rop = PAT_ROP_GXCOPY;
@@ -1508,8 +1510,10 @@ static void intelfb_copyarea(struct fb_info *info,
 	DBG_MSG("intelfb_copyarea\n");
 #endif
 
-	if (!ACCEL(dinfo, info) || dinfo->depth == 4)
-		return cfb_copyarea(info, region);
+	if (!ACCEL(dinfo, info) || dinfo->depth == 4) {
+		cfb_copyarea(info, region);
+		return;
+	}
 
 	intelfbhw_do_bitblt(dinfo, region->sx, region->sy, region->dx,
 			    region->dy, region->width, region->height,
@@ -1526,9 +1530,11 @@ static void intelfb_imageblit(struct fb_info *info,
 	DBG_MSG("intelfb_imageblit\n");
 #endif
 
-	if (!ACCEL(dinfo, info) || dinfo->depth == 4
-	    || image->depth != 1)
-		return cfb_imageblit(info, image);
+	if (!ACCEL(dinfo, info) || dinfo->depth == 4 ||
+	    image->depth != 1) {
+		cfb_imageblit(info, image);
+		return;
+	}
 
 	if (dinfo->depth != 8) {
 		fgcolor = dinfo->pseudo_palette[image->fg_color];
@@ -1542,7 +1548,7 @@ static void intelfb_imageblit(struct fb_info *info,
 				    image->height, image->data,
 				    image->dx, image->dy,
 				    dinfo->pitch, info->var.bits_per_pixel))
-		return cfb_imageblit(info, image);
+		cfb_imageblit(info, image);
 }
 
 static int intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
Signature · 1 line
1.5.5.rc1.135.g8527