aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/XGI_accel.c
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2011-02-21 10:09:05 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-23 14:18:07 -0800
commitcfd6ea0b731d048037ba00b8dd3777a91b9675e0 (patch)
tree0439b888dce60798e25d9fad233812f6457f3457 /drivers/staging/xgifb/XGI_accel.c
parentfc3cc2caa07568de92cc84780b89b5cf9fbf28b7 (diff)
downloadkernel_samsung_smdk4412-cfd6ea0b731d048037ba00b8dd3777a91b9675e0.zip
kernel_samsung_smdk4412-cfd6ea0b731d048037ba00b8dd3777a91b9675e0.tar.gz
kernel_samsung_smdk4412-cfd6ea0b731d048037ba00b8dd3777a91b9675e0.tar.bz2
Staging: xgifb: Removes dead code
xgifb staging driver has code that dependens on XGIfb_accel != 0. But as Dan Carpenter noticed, XGIfb_accel value is always 0 in current driver. So there is code that never gets executed. This patch removes this dead code. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Acked-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/XGI_accel.c')
-rw-r--r--drivers/staging/xgifb/XGI_accel.c57
1 files changed, 3 insertions, 54 deletions
diff --git a/drivers/staging/xgifb/XGI_accel.c b/drivers/staging/xgifb/XGI_accel.c
index 7954974..7f485fe 100644
--- a/drivers/staging/xgifb/XGI_accel.c
+++ b/drivers/staging/xgifb/XGI_accel.c
@@ -216,73 +216,22 @@ void XGIfb_syncaccel(void)
int fbcon_XGI_sync(struct fb_info *info)
{
- if(!XGIfb_accel) return 0;
- CRITFLAGS
-
- XGI310Sync();
-
- CRITEND
- return 0;
+ return 0;
}
void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
{
- int col=0;
- CRITFLAGS
-
-
- if(!rect->width || !rect->height)
- return;
+ if (!rect->width || !rect->height)
+ return;
- if(!XGIfb_accel) {
cfb_fillrect(info, rect);
return;
- }
-
- switch(info->var.bits_per_pixel) {
- case 8: col = rect->color;
- break;
- case 16: col = ((u32 *)(info->pseudo_palette))[rect->color];
- break;
- case 32: col = ((u32 *)(info->pseudo_palette))[rect->color];
- break;
- }
-
-
- CRITBEGIN
- XGI310SetupForSolidFill(col, myrops[rect->rop], 0);
- XGI310SubsequentSolidFillRect(rect->dx, rect->dy, rect->width, rect->height);
- CRITEND
- XGI310Sync();
-
-
}
void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area)
{
- int xdir, ydir;
- CRITFLAGS
-
-
- if(!XGIfb_accel) {
cfb_copyarea(info, area);
return;
- }
-
- if(!area->width || !area->height)
- return;
-
- if(area->sx < area->dx) xdir = 0;
- else xdir = 1;
- if(area->sy < area->dy) ydir = 0;
- else ydir = 1;
-
- CRITBEGIN
- XGI310SetupForScreenToScreenCopy(xdir, ydir, 3, 0, -1);
- XGI310SubsequentScreenToScreenCopy(area->sx, area->sy, area->dx, area->dy, area->width, area->height);
- CRITEND
- XGI310Sync();
-
}