ASoC: davinci: Convert to use devm_ioremap_resource

[firefly-linux-kernel-4.4.55.git] / sound / soc / davinci / davinci-mcasp.c

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index b960e626dad9093680e2d6efcd778fee0f1d380d..add6bb99661daced09d250eb04af15b37c6ffb44 100644 (file)
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1613,7 +1613,7 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp)
 static int davinci_mcasp_probe(struct platform_device *pdev)
 {
        struct snd_dmaengine_dai_dma_data *dma_data;
-       struct resource *mem, *ioarea, *res, *dat;
+       struct resource *mem, *res, *dat;
        struct davinci_mcasp_pdata *pdata;
        struct davinci_mcasp *mcasp;
        char *irq_name;
@@ -1648,22 +1648,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
                }
        }
 
-       ioarea = devm_request_mem_region(&pdev->dev, mem->start,
-                       resource_size(mem), pdev->name);
-       if (!ioarea) {
-               dev_err(&pdev->dev, "Audio region already claimed\n");
-               return -EBUSY;
-       }
+       mcasp->base = devm_ioremap_resource(&pdev->dev, mem);
+       if (IS_ERR(mcasp->base))
+               return PTR_ERR(mcasp->base);
 
        pm_runtime_enable(&pdev->dev);
 
-       mcasp->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
-       if (!mcasp->base) {
-               dev_err(&pdev->dev, "ioremap failed\n");
-               ret = -ENOMEM;
-               goto err;
-       }
-
        mcasp->op_mode = pdata->op_mode;
        /* sanity check for tdm slots parameter */
        if (mcasp->op_mode == DAVINCI_MCASP_IIS_MODE) {