These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / soc / omap / mcbsp.c

diff --git a/kernel/sound/soc/omap/mcbsp.c b/kernel/sound/soc/omap/mcbsp.c
index 68a1252..c7563e2 100644 (file)
--- a/kernel/sound/soc/omap/mcbsp.c
+++ b/kernel/sound/soc/omap/mcbsp.c
@@ -965,25 +965,15 @@ int omap_mcbsp_init(struct platform_device *pdev)
        mcbsp->free = true;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
-       if (!res) {
+       if (!res)
                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-               if (!res) {
-                       dev_err(mcbsp->dev, "invalid memory resource\n");
-                       return -ENOMEM;
-               }
-       }
-       if (!devm_request_mem_region(&pdev->dev, res->start, resource_size(res),
-                                    dev_name(&pdev->dev))) {
-               dev_err(mcbsp->dev, "memory region already claimed\n");
-               return -ENODEV;
-       }
+
+       mcbsp->io_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(mcbsp->io_base))
+               return PTR_ERR(mcbsp->io_base);
 
        mcbsp->phys_base = res->start;
        mcbsp->reg_cache_size = resource_size(res);
-       mcbsp->io_base = devm_ioremap(&pdev->dev, res->start,
-                                     resource_size(res));
-       if (!mcbsp->io_base)
-               return -ENOMEM;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dma");
        if (!res)