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

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

staging: xgifb: eliminate global fb_info variable 



Move fb_info into xgi_video_info.

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 54301b5c

drivers/staging/xgifb/XGI_main.h

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


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



/* Fbcon variables */

static struct fb_info *fb_info;



static struct fb_var_screeninfo default_var = {

	.xres		= 0,

	.yres		= 0,

drivers/staging/xgifb/XGI_main_26.c

+3 −0
Original line number Diff line number Diff line
@@ -1986,12 +1986,14 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, 
	u8 CR48, CR38;

	int ret;

	bool xgi21_drvlcdcaplist = false;

	struct fb_info *fb_info;



	memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info));

	fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);

	if (!fb_info)

		return -ENOMEM;



	xgi_video_info.fb_info = fb_info;

	xgi_video_info.chip_id = pdev->device;

	pci_read_config_byte(pdev,

			     PCI_REVISION_ID,
@@ -2447,6 +2449,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, 
static void __devexit xgifb_remove(struct pci_dev *pdev)

{

	struct video_info *xgifb_info = pci_get_drvdata(pdev);

	struct fb_info *fb_info = xgifb_info->fb_info;



	unregister_framebuffer(fb_info);

#ifdef CONFIG_MTRR

drivers/staging/xgifb/XGIfb.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ enum xgi_tv_plug { /* vicki@030226 */ 
};



struct video_info {

	struct fb_info *fb_info;



	int           chip_id;

	unsigned int  video_size;

	unsigned long video_base;