pci: use pci_ioremap_bar() in drivers/video
PATCH 1/1 pci: use pci_ioremap_bar() in drivers/video
From a7e1803c8c6534c0b432cec494cf8bc9ea12d972 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <[email protected]>
Date: Sun, 28 Sep 2008 16:21:24 -0700
Subject: [PATCH] pci: use pci_ioremap_bar() in drivers/video
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 <[email protected]>
--- drivers/video/aty/aty128fb.c | 2 +- drivers/video/cyber2000fb.c | 3 +-- drivers/video/geode/gx1fb_core.c | 3 +-- drivers/video/geode/gxfb_core.c | 8 +++----- drivers/video/geode/lxfb_core.c | 9 +++------ drivers/video/gxt4500.c | 4 ++-- 6 files changed, 11 insertions(+), 18 deletions(-)
drivers/video/aty/aty128fb.c +1 -1
@@ -2051,7 +2051,7 @@ static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_/* Virtualize mmio region */ 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) goto err_free_info;
drivers/video/cyber2000fb.c +1 -2
@@ -1583,8 +1583,7 @@ cyberpro_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) goto failed_release; cfb->dev = dev; - cfb->region =ioremap (pci_resource_start (dev,0 ), -pci_resource_len (dev,0 )); + cfb->region =pci_ioremap_bar (dev,0 );if (!cfb->region) goto failed_ioremap;
drivers/video/geode/gx1fb_core.c +1 -2
@@ -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)" );if (ret <0 )return ret; - par->vid_regs =ioremap (pci_resource_start (dev,0 ), -pci_resource_len (dev,0 )); + par->vid_regs =pci_ioremap_bar (dev,0 );if (!par->vid_regs)return -ENOMEM ;
drivers/video/geode/gxfb_core.c +3 -5
@@ -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)" );if (ret <0 )return ret; - par->vid_regs =ioremap (pci_resource_start (dev,3 ), -pci_resource_len (dev,3 )); + par->vid_regs =pci_ioremap_bar (dev,3 );if (!par->vid_regs)return -ENOMEM ; ret =pci_request_region (dev,2 ,"gxfb (display controller)" );if (ret <0 )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)return -ENOMEM ; ret =pci_request_region (dev,1 ,"gxfb (graphics processor)" );if (ret <0 )return ret; - par->gp_regs =ioremap (pci_resource_start (dev,1 ), -pci_resource_len (dev,1 )); + par->gp_regs =pci_ioremap_bar (dev,1 );if (!par->gp_regs)return -ENOMEM ;
drivers/video/geode/lxfb_core.c +3 -6
@@ -379,20 +379,17 @@ static int __init lxfb_map_video_memory(struct fb_info *info,if (info->screen_base ==NULL )return ret; - par->gp_regs =ioremap (pci_resource_start (dev,1 ), -pci_resource_len (dev,1 )); + par->gp_regs =pci_ioremap_bar (dev,1 );if (par->gp_regs ==NULL )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 ==NULL )return ret; - par->vp_regs =ioremap (pci_resource_start (dev,3 ), -pci_resource_len (dev,3 )); + par->vp_regs =pci_ioremap_bar (dev,3 );if (par->vp_regs ==NULL )return ret;
drivers/video/gxt4500.c +2 -2
@@ -648,7 +648,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev, info->pseudo_palette = par->pseudo_palette; 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) {dev_err (&pdev->dev,"gxt4500: cannot map registers\n" ); 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_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) {dev_err (&pdev->dev,"gxt4500: cannot map framebuffer\n" ); goto err_unmap_regs;
Signature · 14 lines
1.5.5.1 -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/