staging: xgifb: eliminate fbcon_XGI_fillrect()

fbcon_XGI_fillrect() implementation is trivial and can be replaced with
cfb_fillrect().

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 968ac04c4d52f078bba48ffcea2574f9f03cd59c..1e4c06c8198ba21463a3ca95313f6fc6bb07d3da 100644 (file)
--- a/drivers/staging/xgifb/XGI_accel.c
+++ b/drivers/staging/xgifb/XGI_accel.c
@@ -114,12 +114,3 @@ void XGIfb_syncaccel(void)
     XGI310Sync();
 
 }
-
-void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
-{
-       if (!rect->width || !rect->height)
-               return;
-
-       cfb_fillrect(info, rect);
-       return;
-}

diff --git a/drivers/staging/xgifb/XGI_accel.h b/drivers/staging/xgifb/XGI_accel.h
index 836ee40cbf7f6b0d95b65c08d650231a1946d9de..a1fb5d39b1539720b20f17b1a8eeb8f7f68d9267 100644 (file)
--- a/drivers/staging/xgifb/XGI_accel.h
+++ b/drivers/staging/xgifb/XGI_accel.h
@@ -478,6 +478,4 @@ 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);
-
 #endif

diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 15d72eece878327f288dacc911bd7083a2d0f3da..39e15ded7f4f24cf01bc29b4cd6b282fa0dad951 100644 (file)
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -793,8 +793,6 @@ static int      XGIfb_blank(int blank,
 /*static int   XGIfb_mmap(struct fb_info *info, struct file *file,
                           struct vm_area_struct *vma);
 */
-extern void     fbcon_XGI_fillrect(struct fb_info *info,
-                                   const struct fb_fillrect *rect);
 
 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 6cf2eea0871bf893b73115f284f95d78accda054..fa97c3796a012a6aedfe1cd5257ba063aaa8a459 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1738,7 +1738,7 @@ static struct fb_ops XGIfb_ops = {
        .fb_pan_display = XGIfb_pan_display,
 #endif
        .fb_blank = XGIfb_blank,
-       .fb_fillrect = fbcon_XGI_fillrect,
+       .fb_fillrect = cfb_fillrect,
        .fb_copyarea = cfb_copyarea,
        .fb_imageblit = cfb_imageblit,
        .fb_ioctl = XGIfb_ioctl,