From 85c3c562aa52d863e286049973cd508deb9f869a Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Mon, 28 Feb 2011 20:59:21 +0200 Subject: [PATCH] staging: xgifb: eliminate fbcon_XGI_copyarea() fbcon_XGI_copyarea() implementation is trivial and can be replaced with cfb_copyarea(). Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/XGI_accel.c | 9 --------- drivers/staging/xgifb/XGI_accel.h | 2 -- drivers/staging/xgifb/XGI_main.h | 2 -- drivers/staging/xgifb/XGI_main_26.c | 2 +- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/staging/xgifb/XGI_accel.c b/drivers/staging/xgifb/XGI_accel.c index 905b34a..968ac04 100644 --- a/drivers/staging/xgifb/XGI_accel.c +++ b/drivers/staging/xgifb/XGI_accel.c @@ -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; -} - - - diff --git a/drivers/staging/xgifb/XGI_accel.h b/drivers/staging/xgifb/XGI_accel.h index 6cecdf7..836ee40 100644 --- a/drivers/staging/xgifb/XGI_accel.h +++ b/drivers/staging/xgifb/XGI_accel.h @@ -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 diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 1b45414..15d72eec 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -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); diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 5e69728..6cf2eea 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -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, */ -- 2.7.4