evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: xgifb: eliminate global fb_info variable

Browse source 
Move fb_info into xgi_video_info.

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>
This commit is contained in:
Aaro Koskinen 2011-10-11 21:47:14 +03:00 • committed by Greg Kroah-Hartman
parent 54301b5cfe
commit 19c1e88e02
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/xgifb/XGI_main.h
View file

@ -125,9 +125,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
/* ------------------- Global Variables ----------------------------- */ /* ------------------- Global Variables ----------------------------- */
/* Fbcon variables */
static struct fb_info *fb_info;
static struct fb_var_screeninfo default_var = { static struct fb_var_screeninfo default_var = {
.xres = 0, .xres = 0,
.yres = 0, .yres = 0,

3
drivers/staging/xgifb/XGI_main_26.c
View file

@ -1986,12 +1986,14 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
u8 CR48, CR38; u8 CR48, CR38;
int ret; int ret;
bool xgi21_drvlcdcaplist = false; bool xgi21_drvlcdcaplist = false;
struct fb_info *fb_info;
memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info)); memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info));
fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev); fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
if (!fb_info) if (!fb_info)
return -ENOMEM; return -ENOMEM;
xgi_video_info.fb_info = fb_info;
xgi_video_info.chip_id = pdev->device; xgi_video_info.chip_id = pdev->device;
pci_read_config_byte(pdev, pci_read_config_byte(pdev,
PCI_REVISION_ID, PCI_REVISION_ID,
@ -2447,6 +2449,7 @@ error:
static void __devexit xgifb_remove(struct pci_dev *pdev) static void __devexit xgifb_remove(struct pci_dev *pdev)
{ {
struct video_info *xgifb_info = pci_get_drvdata(pdev); struct video_info *xgifb_info = pci_get_drvdata(pdev);
struct fb_info *fb_info = xgifb_info->fb_info;
unregister_framebuffer(fb_info); unregister_framebuffer(fb_info);
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR

2
drivers/staging/xgifb/XGIfb.h
View file

@ -53,6 +53,8 @@ enum xgi_tv_plug { /* vicki@030226 */
}; };
struct video_info { struct video_info {
struct fb_info *fb_info;
int chip_id; int chip_id;
unsigned int video_size; unsigned int video_size;
unsigned long video_base; unsigned long video_base;