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>
git-mirror · Feb 28, 2011 · 1b40296 · 1b40296
1 parent 85c3c56
commit 1b40296
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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