lkml.org 
[lkml]   [2011]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/5] staging: xgifb: eliminate fbcon_XGI_fillrect()
Date
fbcon_XGI_fillrect() implementation is trivial and can be replaced with
cfb_fillrect().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
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 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_accel.c b/drivers/staging/xgifb/XGI_accel.c
index 968ac04..1e4c06c 100644
--- 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 836ee40..a1fb5d3 100644
--- 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 15d72ee..39e15de 100644
--- 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 6cf2eea..fa97c37 100644
--- 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,
--
1.5.6.5


\
 
 \ /
  Last update: 2011-02-28 20:03    [W:0.215 / U:1.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site