ARM: integrator: use devm_ioremap() to remap CM
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 10 Oct 2013 14:51:28 +0000 (16:51 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 16 Oct 2013 12:10:10 +0000 (14:10 +0200)
In the PCIv3 driver, use devm_ioremap() instead of just ioremap()
when remapping the system controller in the PCIv3 driver, so
the mapping will be automatically released on probe failure.

Reported-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-integrator/pci_v3.c

index ce8d0ca..c9c5a33 100644 (file)
@@ -842,7 +842,7 @@ static int __init pci_v3_probe(struct platform_device *pdev)
        int irq, ret;
 
        /* Remap the Integrator system controller */
-       ap_syscon_base = ioremap(INTEGRATOR_SC_BASE, 0x100);
+       ap_syscon_base = devm_ioremap(&pdev->dev, INTEGRATOR_SC_BASE, 0x100);
        if (!ap_syscon_base) {
                dev_err(&pdev->dev, "unable to remap the AP syscon for PCIv3\n");
                return -ENODEV;