Skip to content

Commit

Permalink
staging: xgifb: eliminate "accel" field from video_info
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Feb 28, 2011
1 parent 1b40296 commit 5b863c3
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
9 changes: 0 additions & 9 deletions drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/xgifb/XGIfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ struct video_info{
unsigned int pcislot;
unsigned int pcifunc;

int accel;
unsigned short subsysvendor;
unsigned short subsysdevice;

Expand Down

0 comments on commit 5b863c3

Please sign in to comment.