Skip to content

Commit

Permalink
staging: xgifb: use PCI drvdata
Browse files Browse the repository at this point in the history
Don't access the global xgi_video_info directly in xgifb_remove().

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>
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Oct 12, 2011
1 parent 3d65c85 commit 54301b5
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -2415,6 +2415,8 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
goto error_mtrr;
}

pci_set_drvdata(pdev, &xgi_video_info);

dumpVGAReg();

return 0;
Expand Down Expand Up @@ -2444,17 +2446,18 @@ 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);

unregister_framebuffer(fb_info);
#ifdef CONFIG_MTRR
if (xgi_video_info.mtrr >= 0)
mtrr_del(xgi_video_info.mtrr, xgi_video_info.video_base,
xgi_video_info.video_size);
if (xgifb_info->mtrr >= 0)
mtrr_del(xgifb_info->mtrr, xgifb_info->video_base,
xgifb_info->video_size);
#endif /* CONFIG_MTRR */
iounmap(xgi_video_info.mmio_vbase);
iounmap(xgi_video_info.video_vbase);
release_mem_region(xgi_video_info.mmio_base, xgi_video_info.mmio_size);
release_mem_region(xgi_video_info.video_base,
xgi_video_info.video_size);
iounmap(xgifb_info->mmio_vbase);
iounmap(xgifb_info->video_vbase);
release_mem_region(xgifb_info->mmio_base, xgifb_info->mmio_size);
release_mem_region(xgifb_info->video_base, xgifb_info->video_size);
vfree(XGIhw_ext.pjVirtualRomBase);
framebuffer_release(fb_info);
pci_set_drvdata(pdev, NULL);
Expand Down

0 comments on commit 54301b5

Please sign in to comment.