staging: xgifb: eliminate fbcon_XGI_copyarea()

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>

diff --git a/drivers/staging/xgifb/XGI_accel.c b/drivers/staging/xgifb/XGI_accel.c
index 905b34ae5e9bb8f12f44512cadb5d1acf248ec89..968ac04c4d52f078bba48ffcea2574f9f03cd59c 100644 (file)
--- 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 6cecdf7ca2e21bece826d439f4958ebac226026b..836ee40cbf7f6b0d95b65c08d650231a1946d9de 100644 (file)
--- 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 1b454148cb7879c27cdd1b55225ef5e87614cc94..15d72eece878327f288dacc911bd7083a2d0f3da 100644 (file)
--- 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 5e69728623b7f1646a91bfc5ac35565c557c9af8..6cf2eea0871bf893b73115f284f95d78accda054 100644 (file)
--- 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, */