Skip to content

Commit

Permalink
staging: xgifb: eliminate fbcon_XGI_copyarea()
Browse files Browse the repository at this point in the history
fbcon_XGI_copyarea() implementation is trivial and can be replaced with
cfb_copyarea().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Feb 28, 2011
1 parent a2396df commit 85c3c56
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 14 deletions.
9 changes: 0 additions & 9 deletions drivers/staging/xgifb/XGI_accel.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,3 @@ void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
cfb_fillrect(info, rect);
return;
}

void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area)
{
cfb_copyarea(info, area);
return;
}



2 changes: 0 additions & 2 deletions drivers/staging/xgifb/XGI_accel.h
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,5 @@ int fbcon_XGI_sync(struct fb_info *info);
extern struct video_info xgi_video_info;

void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area);


#endif
2 changes: 0 additions & 2 deletions drivers/staging/xgifb/XGI_main.h
Original file line number Diff line number Diff line change
Expand Up @@ -795,8 +795,6 @@ static int XGIfb_blank(int blank,
*/
extern void fbcon_XGI_fillrect(struct fb_info *info,
const struct fb_fillrect *rect);
extern void fbcon_XGI_copyarea(struct fb_info *info,
const struct fb_copyarea *area);

static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,7 @@ static struct fb_ops XGIfb_ops = {
#endif
.fb_blank = XGIfb_blank,
.fb_fillrect = fbcon_XGI_fillrect,
.fb_copyarea = fbcon_XGI_copyarea,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
.fb_ioctl = XGIfb_ioctl,
/* .fb_mmap = XGIfb_mmap, */
Expand Down

0 comments on commit 85c3c56

Please sign in to comment.