diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-10-11 18:47:27 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-12 15:51:47 (GMT) |
| commit | c11d0ef3e250a4483e10e6984362b07fbf12c5ae (patch) | |
| tree | fdc0b61aeac36bdad1f4368dfa62e7cd2a38b273 /drivers | |
| parent | e9865d47d44600b86e00a274adc8bf28e10677da (diff) | |
| download | linux-c11d0ef3e250a4483e10e6984362b07fbf12c5ae.tar.xz | |
staging: xgifb: eliminate XGIfb_fix
Eliminate XGIfb_fix and initialize needed fields of fb_info->fix
in probe().
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main.h | 7 | ||||
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 0d439e9..1d0949c 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -125,13 +125,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table); /* ------------------- Global Variables ----------------------------- */ -static struct fb_fix_screeninfo XGIfb_fix = { - .id = "XGI", - .type = FB_TYPE_PACKED_PIXELS, - .xpanstep = 1, - .ypanstep = 1, -}; - /* display status */ static int XGIfb_crt1off; static int XGIfb_forcecrt1 = -1; diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 5eed802..ba7f096 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -2390,8 +2390,12 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, } + strncpy(fb_info->fix.id, "XGI", sizeof(fb_info->fix.id) - 1); + fb_info->fix.type = FB_TYPE_PACKED_PIXELS; + fb_info->fix.xpanstep = 1; + fb_info->fix.ypanstep = 1; + fb_info->flags = FBINFO_FLAG_DEFAULT; - fb_info->fix = XGIfb_fix; fb_info->screen_base = xgifb_info->video_vbase; fb_info->fbops = &XGIfb_ops; XGIfb_get_fix(&fb_info->fix, -1, fb_info); |