Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c11d0ef3 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: eliminate XGIfb_fix 



Eliminate XGIfb_fix and initialize needed fields of fb_info->fix
in probe().

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e9865d47

drivers/staging/xgifb/XGI_main.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -125,13 +125,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table); 




/* ------------------- Global Variables ----------------------------- */

/* ------------------- Global Variables ----------------------------- */





static struct fb_fix_screeninfo XGIfb_fix = {

	.id		= "XGI",

	.type		= FB_TYPE_PACKED_PIXELS,

	.xpanstep	= 1,

	.ypanstep	= 1,

};



/* display status */

/* display status */

static int XGIfb_crt1off;

static int XGIfb_crt1off;

static int XGIfb_forcecrt1 = -1;

static int XGIfb_forcecrt1 = -1;

drivers/staging/xgifb/XGI_main_26.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -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->flags = FBINFO_FLAG_DEFAULT;

	fb_info->fix = XGIfb_fix;

	fb_info->screen_base = xgifb_info->video_vbase;

	fb_info->screen_base = xgifb_info->video_vbase;

	fb_info->fbops = &XGIfb_ops;

	fb_info->fbops = &XGIfb_ops;

	XGIfb_get_fix(&fb_info->fix, -1, fb_info);

	XGIfb_get_fix(&fb_info->fix, -1, fb_info);