spi/atmel: Convert to devm_ioremap_resource()
authorMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 12:22:35 +0000 (13:22 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 22:33:16 +0000 (23:33 +0100)
This simplifies error handling.

Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-atmel.c

index ce4953f74423da06dbf19522a89a38fadc3f4bac..118a938776bd9eec7a79372a915c3498f7610103 100644 (file)
@@ -1546,7 +1546,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&as->queue);
 
        as->pdev = pdev;
-       as->regs = ioremap(regs->start, resource_size(regs));
+       as->regs = devm_ioremap_resource(&pdev->dev, regs);
        if (!as->regs)
                goto out_free_buffer;
        as->phybase = regs->start;
@@ -1617,7 +1617,6 @@ out_free_dma:
 out_free_irq:
        free_irq(irq, master);
 out_unmap_regs:
-       iounmap(as->regs);
 out_free_buffer:
        if (!as->use_pdc)
                tasklet_kill(&as->tasklet);
@@ -1669,7 +1668,6 @@ static int atmel_spi_remove(struct platform_device *pdev)
        clk_disable_unprepare(as->clk);
        clk_put(as->clk);
        free_irq(as->irq, master);
-       iounmap(as->regs);
 
        spi_unregister_master(master);