Browse Source

Merge tag 'vexpress-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/drivers

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>
Olof Johansson 7 years ago
parent
commit
4726245505
1 changed files with 3 additions and 7 deletions
  1. 3 7
      drivers/misc/vexpress-syscfg.c

+ 3 - 7
drivers/misc/vexpress-syscfg.c

@@ -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,