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

Commit 809092dc authored by Sudeep Holla's avatar Sudeep Holla Committed by Will Deacon
Browse files

drivers/perf: arm-ccn: Use devm_ioremap_resource() to map memory 



Instead of checking the return value of platform_get_resource(), we can
use devm_ioremap_resource() which has the NULL pointer check and the
memory region requesting. devm_ioremap_resource is designed to replace
calls to devm_request_mem_region followed by devm_ioremap, so let's use
the same.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 06060ea7

drivers/perf/arm-ccn.c

+3 −11
Original line number Diff line number Diff line
@@ -1485,17 +1485,9 @@ static int arm_ccn_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ccn);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -EINVAL;



	if (!devm_request_mem_region(ccn->dev, res->start,

			resource_size(res), pdev->name))

		return -EBUSY;



	ccn->base = devm_ioremap(ccn->dev, res->start,

				resource_size(res));

	if (!ccn->base)

		return -EFAULT;

	ccn->base = devm_ioremap_resource(ccn->dev, res);

	if (IS_ERR(ccn->base))

		return PTR_ERR(ccn->base);



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res)