Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47262455 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'vexpress-update-4.19' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 030f457a cc4aecc5

drivers/misc/vexpress-syscfg.c

+3 −7
Original line number Diff line number Diff line
@@ -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,