adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

pci: use pci_ioremap_bar() in drivers/video

Browse source 
Use the newly introduced pci_ioremap_bar() function in drivers/video.
pci_ioremap_bar() just takes a pci device and a bar number, with the goal
of making it really hard to get wrong, while also having a central place
to stick sanity checks.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Arjan van de Ven 2009-01-06 14:42:28 -08:00 committed by Linus Torvalds
parent ab5dc37202
commit 3c36aa5ccd
6 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/aty/aty128fb.c
View file

@ -2051,7 +2051,7 @@ static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_
/* Virtualize mmio region */ /* Virtualize mmio region */
info->fix.mmio_start = reg_addr; info->fix.mmio_start = reg_addr;
par->regbase = ioremap(reg_addr, pci_resource_len(pdev, 2)); par->regbase = pci_ioremap_bar(pdev, 2);
if (!par->regbase) if (!par->regbase)
goto err_free_info; goto err_free_info;

3
drivers/video/cyber2000fb.c
View file

@ -1583,8 +1583,7 @@ cyberpro_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
goto failed_release; goto failed_release;
cfb->dev = dev; cfb->dev = dev;
cfb->region = ioremap(pci_resource_start(dev, 0), cfb->region = pci_ioremap_bar(dev, 0);
pci_resource_len(dev, 0));
if (!cfb->region) if (!cfb->region)
goto failed_ioremap; goto failed_ioremap;

3
drivers/video/geode/gx1fb_core.c
View file

@ -217,8 +217,7 @@ static int __init gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *d
ret = pci_request_region(dev, 0, "gx1fb (video)"); ret = pci_request_region(dev, 0, "gx1fb (video)");
if (ret < 0) if (ret < 0)
return ret; return ret;
par->vid_regs = ioremap(pci_resource_start(dev, 0), par->vid_regs = pci_ioremap_bar(dev, 0);
pci_resource_len(dev, 0));
if (!par->vid_regs) if (!par->vid_regs)
return -ENOMEM; return -ENOMEM;

8
drivers/video/geode/gxfb_core.c
View file

@ -242,23 +242,21 @@ static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *de
ret = pci_request_region(dev, 3, "gxfb (video processor)"); ret = pci_request_region(dev, 3, "gxfb (video processor)");
if (ret < 0) if (ret < 0)
return ret; return ret;
par->vid_regs = ioremap(pci_resource_start(dev, 3), par->vid_regs = pci_ioremap_bar(dev, 3);
pci_resource_len(dev, 3));
if (!par->vid_regs) if (!par->vid_regs)
return -ENOMEM; return -ENOMEM;
ret = pci_request_region(dev, 2, "gxfb (display controller)"); ret = pci_request_region(dev, 2, "gxfb (display controller)");
if (ret < 0) if (ret < 0)
return ret; return ret;
par->dc_regs = ioremap(pci_resource_start(dev, 2), pci_resource_len(dev, 2)); par->dc_regs = pci_ioremap_bar(dev, 2);
if (!par->dc_regs) if (!par->dc_regs)
return -ENOMEM; return -ENOMEM;
ret = pci_request_region(dev, 1, "gxfb (graphics processor)"); ret = pci_request_region(dev, 1, "gxfb (graphics processor)");
if (ret < 0) if (ret < 0)
return ret; return ret;
par->gp_regs = ioremap(pci_resource_start(dev, 1), par->gp_regs = pci_ioremap_bar(dev, 1);
pci_resource_len(dev, 1));
if (!par->gp_regs) if (!par->gp_regs)
return -ENOMEM; return -ENOMEM;

9
drivers/video/geode/lxfb_core.c
View file

@ -379,20 +379,17 @@ static int __init lxfb_map_video_memory(struct fb_info *info,
if (info->screen_base == NULL) if (info->screen_base == NULL)
return ret; return ret;
par->gp_regs = ioremap(pci_resource_start(dev, 1), par->gp_regs = pci_ioremap_bar(dev, 1);
pci_resource_len(dev, 1));
if (par->gp_regs == NULL) if (par->gp_regs == NULL)
return ret; return ret;
par->dc_regs = ioremap(pci_resource_start(dev, 2), par->dc_regs = pci_ioremap_bar(dev, 2);
pci_resource_len(dev, 2));
if (par->dc_regs == NULL) if (par->dc_regs == NULL)
return ret; return ret;
par->vp_regs = ioremap(pci_resource_start(dev, 3), par->vp_regs = pci_ioremap_bar(dev, 3);
pci_resource_len(dev, 3));
if (par->vp_regs == NULL) if (par->vp_regs == NULL)
return ret; return ret;

4
drivers/video/gxt4500.c
View file

@ -648,7 +648,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
info->pseudo_palette = par->pseudo_palette; info->pseudo_palette = par->pseudo_palette;
info->fix.mmio_start = reg_phys; info->fix.mmio_start = reg_phys;
par->regs = ioremap(reg_phys, pci_resource_len(pdev, 0)); par->regs = pci_ioremap_bar(pdev, 0);
if (!par->regs) { if (!par->regs) {
dev_err(&pdev->dev, "gxt4500: cannot map registers\n"); dev_err(&pdev->dev, "gxt4500: cannot map registers\n");
goto err_free_all; goto err_free_all;
@ -656,7 +656,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
info->fix.smem_start = fb_phys; info->fix.smem_start = fb_phys;
info->fix.smem_len = pci_resource_len(pdev, 1); info->fix.smem_len = pci_resource_len(pdev, 1);
info->screen_base = ioremap(fb_phys, pci_resource_len(pdev, 1)); info->screen_base = pci_ioremap_bar(pdev, 1);
if (!info->screen_base) { if (!info->screen_base) {
dev_err(&pdev->dev, "gxt4500: cannot map framebuffer\n"); dev_err(&pdev->dev, "gxt4500: cannot map framebuffer\n");
goto err_unmap_regs; goto err_unmap_regs;