summaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb
diff options
context:
space:
mode:
authorAaro Koskinen2011-02-28 19:59:23 +0100
committerGreg Kroah-Hartman2011-03-01 00:21:18 +0100
commit5b863c34ecd4240e32339f277796654f5ae1feac (patch)
tree86ca79168c91d1ed72a5eca65fbe6d3ce3dbe89a /drivers/staging/xgifb
parentstaging: xgifb: eliminate fbcon_XGI_fillrect() (diff)
downloadkernel-qcow2-linux-5b863c34ecd4240e32339f277796654f5ae1feac.tar.gz
kernel-qcow2-linux-5b863c34ecd4240e32339f277796654f5ae1feac.tar.xz
kernel-qcow2-linux-5b863c34ecd4240e32339f277796654f5ae1feac.zip
staging: xgifb: eliminate "accel" field from video_info
The value is always false, so the field can be eliminated. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb')
-rw-r--r--drivers/staging/xgifb/XGI_main_26.c9
-rw-r--r--drivers/staging/xgifb/XGIfb.h1
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index fa97c3796a01..f2a4a2a6bd71 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1187,7 +1187,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
xgi_video_info.org_x = xgi_video_info.org_y = 0;
xgi_video_info.video_linelength = info->var.xres_virtual
* (xgi_video_info.video_bpp >> 3);
- xgi_video_info.accel = 0;
switch (xgi_video_info.video_bpp) {
case 8:
xgi_video_info.DstColor = 0x0000;
@@ -1219,7 +1218,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
default:
xgi_video_info.video_cmap_len = 16;
printk(KERN_ERR "XGIfb: Unsupported depth %d", xgi_video_info.video_bpp);
- xgi_video_info.accel = 0;
break;
}
}
@@ -1635,7 +1633,6 @@ static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd,
default:
xgi_video_info.video_cmap_len = 16;
printk(KERN_ERR "XGIfb: Unsupported accel depth %d", xgi_video_info.video_bpp);
- xgi_video_info.accel = 0;
break;
}
@@ -2617,10 +2614,6 @@ static void XGIfb_pre_setmode(void)
outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR30, cr30);
outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR31, cr31);
outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR33, (XGIfb_rate_idx & 0x0F));
-
- if (xgi_video_info.accel)
- XGIfb_syncaccel();
-
}
static void XGIfb_post_setmode(void)
@@ -3341,8 +3334,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
}
- xgi_video_info.accel = 0;
-
fb_info->flags = FBINFO_FLAG_DEFAULT;
fb_info->var = default_var;
fb_info->fix = XGIfb_fix;
diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index b6715ba9b681..8e59e15281b7 100644
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/drivers/staging/xgifb/XGIfb.h
@@ -193,7 +193,6 @@ struct video_info{
unsigned int pcislot;
unsigned int pcifunc;
- int accel;
unsigned short subsysvendor;
unsigned short subsysdevice;