intelfb: fix sparse warnings
Fix this sparse warnings: drivers/video/intelfb/intelfbdrv.c:1497:3: warning: returning void-valued expression drivers/video/intelfb/intelfbdrv.c:1525:3: warning: returning void-valued expression drivers/video/intelfb/intelfbdrv.c:1544:3: warning: returning void-valued expression drivers/video/intelfb/intelfbdrv.c:1558:3: warning: returning void-valued expression Signed-off-by: Hannes Eder <hannes@hanneseder.net> Cc: Krzysztof Helt <krzysztof.h1@poczta.fm> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4fa34cd051
commit
fd002050be
|
@ -1493,8 +1493,10 @@ static void intelfb_fillrect (struct fb_info *info,
|
||||||
DBG_MSG("intelfb_fillrect\n");
|
DBG_MSG("intelfb_fillrect\n");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!ACCEL(dinfo, info) || dinfo->depth == 4)
|
if (!ACCEL(dinfo, info) || dinfo->depth == 4) {
|
||||||
return cfb_fillrect(info, rect);
|
cfb_fillrect(info, rect);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (rect->rop == ROP_COPY)
|
if (rect->rop == ROP_COPY)
|
||||||
rop = PAT_ROP_GXCOPY;
|
rop = PAT_ROP_GXCOPY;
|
||||||
|
@ -1521,8 +1523,10 @@ static void intelfb_copyarea(struct fb_info *info,
|
||||||
DBG_MSG("intelfb_copyarea\n");
|
DBG_MSG("intelfb_copyarea\n");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!ACCEL(dinfo, info) || dinfo->depth == 4)
|
if (!ACCEL(dinfo, info) || dinfo->depth == 4) {
|
||||||
return cfb_copyarea(info, region);
|
cfb_copyarea(info, region);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
intelfbhw_do_bitblt(dinfo, region->sx, region->sy, region->dx,
|
intelfbhw_do_bitblt(dinfo, region->sx, region->sy, region->dx,
|
||||||
region->dy, region->width, region->height,
|
region->dy, region->width, region->height,
|
||||||
|
@ -1540,8 +1544,10 @@ static void intelfb_imageblit(struct fb_info *info,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!ACCEL(dinfo, info) || dinfo->depth == 4
|
if (!ACCEL(dinfo, info) || dinfo->depth == 4
|
||||||
|| image->depth != 1)
|
|| image->depth != 1) {
|
||||||
return cfb_imageblit(info, image);
|
cfb_imageblit(info, image);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (dinfo->depth != 8) {
|
if (dinfo->depth != 8) {
|
||||||
fgcolor = dinfo->pseudo_palette[image->fg_color];
|
fgcolor = dinfo->pseudo_palette[image->fg_color];
|
||||||
|
@ -1554,8 +1560,10 @@ static void intelfb_imageblit(struct fb_info *info,
|
||||||
if (!intelfbhw_do_drawglyph(dinfo, fgcolor, bgcolor, image->width,
|
if (!intelfbhw_do_drawglyph(dinfo, fgcolor, bgcolor, image->width,
|
||||||
image->height, image->data,
|
image->height, image->data,
|
||||||
image->dx, image->dy,
|
image->dx, image->dy,
|
||||||
dinfo->pitch, info->var.bits_per_pixel))
|
dinfo->pitch, info->var.bits_per_pixel)) {
|
||||||
return cfb_imageblit(info, image);
|
cfb_imageblit(info, image);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
|
static int intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
|
||||||
|
|
Loading…
Reference in a new issue