aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/geode/gxfb_core.c
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2009-01-06 17:42:28 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 18:59:26 -0500
commit3c36aa5ccdf516255ef2eac90dd948da891aa4bd (patch)
tree7930059e5ba51e0fe58fd902b3622664dcfee749 /drivers/video/geode/gxfb_core.c
parentab5dc372021def8f40b34761babecad0bf868b1c (diff)
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 <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>
Diffstat (limited to 'drivers/video/geode/gxfb_core.c')
-rw-r--r--drivers/video/geode/gxfb_core.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index de2b8f9876a5..484118926318 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -242,23 +242,21 @@ static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *de
242 ret = pci_request_region(dev, 3, "gxfb (video processor)"); 242 ret = pci_request_region(dev, 3, "gxfb (video processor)");
243 if (ret < 0) 243 if (ret < 0)
244 return ret; 244 return ret;
245 par->vid_regs = ioremap(pci_resource_start(dev, 3), 245 par->vid_regs = pci_ioremap_bar(dev, 3);
246 pci_resource_len(dev, 3));
247 if (!par->vid_regs) 246 if (!par->vid_regs)
248 return -ENOMEM; 247 return -ENOMEM;
249 248
250 ret = pci_request_region(dev, 2, "gxfb (display controller)"); 249 ret = pci_request_region(dev, 2, "gxfb (display controller)");
251 if (ret < 0) 250 if (ret < 0)
252 return ret; 251 return ret;
253 par->dc_regs = ioremap(pci_resource_start(dev, 2), pci_resource_len(dev, 2)); 252 par->dc_regs = pci_ioremap_bar(dev, 2);
254 if (!par->dc_regs) 253 if (!par->dc_regs)
255 return -ENOMEM; 254 return -ENOMEM;
256 255
257 ret = pci_request_region(dev, 1, "gxfb (graphics processor)"); 256 ret = pci_request_region(dev, 1, "gxfb (graphics processor)");
258 if (ret < 0) 257 if (ret < 0)
259 return ret; 258 return ret;
260 par->gp_regs = ioremap(pci_resource_start(dev, 1), 259 par->gp_regs = pci_ioremap_bar(dev, 1);
261 pci_resource_len(dev, 1));
262 260
263 if (!par->gp_regs) 261 if (!par->gp_regs)
264 return -ENOMEM; 262 return -ENOMEM;