Merge tag 'vexpress-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sat, 14 Jul 2018 21:43:05 +0000 (14:43 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 14 Jul 2018 21:43:05 +0000 (14:43 -0700)
ARMv7 Vexpress update/cleanup for v4.19

Just single cleanup patch to use devm_ioremap_resource in place of
devm_request_mem_region and devm_ioremap.

* tag 'vexpress-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  misc: vexpress/syscfg: Use devm_ioremap_resource() to map memory

Signed-off-by: Olof Johansson <olof@lixom.net>
drivers/misc/vexpress-syscfg.c

index 80a6f199077c941b3b3df024effd2cfca5a9ee9c..6c3591cdf8555ff00e576c33c55a2bdbce3ea61e 100644 (file)
@@ -258,13 +258,9 @@ static int vexpress_syscfg_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&syscfg->funcs);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!devm_request_mem_region(&pdev->dev, res->start,
-                       resource_size(res), pdev->name))
-               return -EBUSY;
-
-       syscfg->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
-       if (!syscfg->base)
-               return -EFAULT;
+       syscfg->base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(syscfg->base))
+               return PTR_ERR(syscfg->base);
 
        /* Must use dev.parent (MFD), as that's where DT phandle points at... */
        bridge = vexpress_config_bridge_register(pdev->dev.parent,