diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-02-28 13:59:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-28 18:21:17 -0500 |
commit | 1b402967bc0ba7a8b0dd075e6c69c137f227a1eb (patch) | |
tree | 9a52effebf49917ed4a943d507f91abf21e78f5a /drivers/staging | |
parent | 85c3c562aa52d863e286049973cd508deb9f869a (diff) |
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/xgifb/XGI_accel.c | 9 | ||||
-rw-r--r-- | drivers/staging/xgifb/XGI_accel.h | 2 | ||||
-rw-r--r-- | drivers/staging/xgifb/XGI_main.h | 2 | ||||
-rw-r--r-- | 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 968ac04c4d5..1e4c06c8198 100644 --- a/drivers/staging/xgifb/XGI_accel.c +++ b/drivers/staging/xgifb/XGI_accel.c | |||
@@ -114,12 +114,3 @@ void XGIfb_syncaccel(void) | |||
114 | XGI310Sync(); | 114 | XGI310Sync(); |
115 | 115 | ||
116 | } | 116 | } |
117 | |||
118 | void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | ||
119 | { | ||
120 | if (!rect->width || !rect->height) | ||
121 | return; | ||
122 | |||
123 | cfb_fillrect(info, rect); | ||
124 | return; | ||
125 | } | ||
diff --git a/drivers/staging/xgifb/XGI_accel.h b/drivers/staging/xgifb/XGI_accel.h index 836ee40cbf7..a1fb5d39b15 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); | |||
478 | 478 | ||
479 | extern struct video_info xgi_video_info; | 479 | extern struct video_info xgi_video_info; |
480 | 480 | ||
481 | void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect); | ||
482 | |||
483 | #endif | 481 | #endif |
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 15d72eece87..39e15ded7f4 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, | |||
793 | /*static int XGIfb_mmap(struct fb_info *info, struct file *file, | 793 | /*static int XGIfb_mmap(struct fb_info *info, struct file *file, |
794 | struct vm_area_struct *vma); | 794 | struct vm_area_struct *vma); |
795 | */ | 795 | */ |
796 | extern void fbcon_XGI_fillrect(struct fb_info *info, | ||
797 | const struct fb_fillrect *rect); | ||
798 | 796 | ||
799 | static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd, | 797 | static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd, |
800 | unsigned long arg); | 798 | unsigned long arg); |
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 6cf2eea0871..fa97c3796a0 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 = { | |||
1738 | .fb_pan_display = XGIfb_pan_display, | 1738 | .fb_pan_display = XGIfb_pan_display, |
1739 | #endif | 1739 | #endif |
1740 | .fb_blank = XGIfb_blank, | 1740 | .fb_blank = XGIfb_blank, |
1741 | .fb_fillrect = fbcon_XGI_fillrect, | 1741 | .fb_fillrect = cfb_fillrect, |
1742 | .fb_copyarea = cfb_copyarea, | 1742 | .fb_copyarea = cfb_copyarea, |
1743 | .fb_imageblit = cfb_imageblit, | 1743 | .fb_imageblit = cfb_imageblit, |
1744 | .fb_ioctl = XGIfb_ioctl, | 1744 | .fb_ioctl = XGIfb_ioctl, |