diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-10 16:51:28 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 14:10:10 +0200 |
| commit | 99d14a1d9b876c9847608983606fa1928f5bf8f3 (patch) | |
| tree | f9b3d5ee0ca78d8bc8f41d885ffad39c2a5410fa /arch/arm/mach-integrator | |
| parent | bdac7eacc43d2e4f2e2b9d5e70050138f5d07d62 (diff) | |
| download | linux-99d14a1d9b876c9847608983606fa1928f5bf8f3.tar.gz linux-99d14a1d9b876c9847608983606fa1928f5bf8f3.tar.bz2 linux-99d14a1d9b876c9847608983606fa1928f5bf8f3.zip | |
ARM: integrator: use devm_ioremap() to remap CM
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>
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index ce8d0cafb7cf..c9c5a33bc802 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -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; |