spi: Convert to devm_ioremap_resource()

[deliverable/linux.git] / drivers / spi / spi-tegra20-sflash.c

diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 448a8cc71df3aef818a0a0d4d0058e2c47cabf68..69c9d23bd47253009f0c3c2aae13800e5772beb0 100644 (file)
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -508,11 +508,9 @@ static int tegra_sflash_probe(struct platform_device *pdev)
                ret = -ENODEV;
                goto exit_free_master;
        }
-       tsd->base = devm_request_and_ioremap(&pdev->dev, r);
-       if (!tsd->base) {
-               dev_err(&pdev->dev,
-                       "Cannot request memregion/iomap dma address\n");
-               ret = -EADDRNOTAVAIL;
+       tsd->base = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(tsd->base)) {
+               ret = PTR_ERR(tsd->base);
                goto exit_free_master;
        }