diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-10-11 21:47:14 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-12 09:51:44 -0600 |
commit | 19c1e88e02c63008745c8549513e53df4aac868f (patch) | |
tree | 0766a7e8b5bfeade0bc697eccab0c40512f6e744 /drivers/staging/xgifb/XGI_main_26.c | |
parent | 54301b5cfe3c16002ab25762a8cd2186beee4a75 (diff) | |
download | op-kernel-dev-19c1e88e02c63008745c8549513e53df4aac868f.zip op-kernel-dev-19c1e88e02c63008745c8549513e53df4aac868f.tar.gz |
staging: xgifb: eliminate global fb_info variable
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>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
-rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 6957b65..f7c0afe 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -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 @@ error: 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 |