From: Harvey Harrison <harvey.harrison@gmail.com>
To: Antonino Daplas <adaplas@gmail.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/7] video: intelfbdrv.c fix sparse return void expression warnings
Date: Wed, 02 Apr 2008 17:33:36 -0700 [thread overview]
Message-ID: <1207182816.5740.23.camel@brick> (raw)
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
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
drivers/video/intelfb/intelfbdrv.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 481d58f..94c3ed0 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -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)
--
1.5.5.rc1.135.g8527
reply other threads:[~2008-04-03 0:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1207182816.5740.23.camel@brick \
--to=harvey.harrison@gmail.com \
--cc=adaplas@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox