openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: xgifb: dynamically allocate xgifb_video_info 

Delete global xgi_video_info and dynamically allocate the data.

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:20 +03:00 committed by Greg Kroah-Hartman
parent fd26d42019
commit fcbdda90ef
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/xgifb/XGI_main_26.c
View File

@ -141,9 +141,6 @@ static inline void dumpVGAReg(void)
} }
#endif #endif
/* data for XGI components */
struct xgifb_video_info xgi_video_info;
#if 1 #if 1
#define DEBUGPRN(x) #define DEBUGPRN(x)
#else #else
@ -1964,14 +1961,15 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
int ret; int ret;
bool xgi21_drvlcdcaplist = false; bool xgi21_drvlcdcaplist = false;
struct fb_info *fb_info; struct fb_info *fb_info;
struct xgifb_video_info *xgifb_info = &xgi_video_info; struct xgifb_video_info *xgifb_info;
struct xgi_hw_device_info *hw_info = &xgifb_info->hw_info; struct xgi_hw_device_info *hw_info;
memset(hw_info, 0, sizeof(struct xgi_hw_device_info)); fb_info = framebuffer_alloc(sizeof(*xgifb_info), &pdev->dev);
fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
if (!fb_info) if (!fb_info)
return -ENOMEM; return -ENOMEM;
xgifb_info = fb_info->par;
hw_info = &xgifb_info->hw_info;
xgifb_info->fb_info = fb_info; xgifb_info->fb_info = fb_info;
xgifb_info->chip_id = pdev->device; xgifb_info->chip_id = pdev->device;
pci_read_config_byte(pdev, pci_read_config_byte(pdev,
@ -2104,7 +2102,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
xgifb_info->mmio_base, xgifb_info->mmio_vbase, xgifb_info->mmio_base, xgifb_info->mmio_vbase,
xgifb_info->mmio_size / 1024); xgifb_info->mmio_size / 1024);
printk("XGIfb: XGIInitNew() ..."); printk("XGIfb: XGIInitNew() ...");
pci_set_drvdata(pdev, &xgi_video_info); pci_set_drvdata(pdev, xgifb_info);
if (XGIInitNew(pdev)) if (XGIInitNew(pdev))
printk("OK\n"); printk("OK\n");
else else
@ -2378,7 +2376,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
fb_info->flags = FBINFO_FLAG_DEFAULT; fb_info->flags = FBINFO_FLAG_DEFAULT;
fb_info->var = default_var; fb_info->var = default_var;
fb_info->fix = XGIfb_fix; fb_info->fix = XGIfb_fix;
fb_info->par = &xgi_video_info;
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);

3
drivers/staging/xgifb/XGIfb.h
View File

@ -101,7 +101,4 @@ struct xgifb_video_info {
char reserved[236]; char reserved[236];
}; };
extern struct xgifb_video_info xgi_video_info;
#endif #endif