Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c36aa5c authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

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: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ab5dc372

drivers/video/aty/aty128fb.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;