Commit b1a9329c authored Aug 19, 2013 by Julia Lawall Committed by Tomi Valkeinen Aug 30, 2013

video: xilinxfb: replace devm_request_and_ioremap by devm_ioremap_resource



Use devm_ioremap_resource instead of devm_request_and_ioremap.

This was done using the semantic patch
scripts/coccinelle/api/devm_ioremap_resource.cocci

The initialization of drvdata->regs_phys was manually moved lower, to take
advantage of the NULL test on res performed by devm_ioremap_resource.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent 9c29fba1

drivers/video/xilinxfb.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -259,12 +259,12 @@ static int xilinxfb_assign(struct platform_device *pdev,
		struct resource *res;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		drvdata->regs_phys = res->start;
		drvdata->regs = devm_request_and_ioremap(&pdev->dev, res);
		if (!drvdata->regs) {
		rc = -EADDRNOTAVAIL;
		drvdata->regs = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(drvdata->regs)) {
		rc = PTR_ERR(drvdata->regs);
		goto err_region;
		}
		drvdata->regs_phys = res->start;
		}

		/* Allocate the framebuffer memory */