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

Commit 8a7f4312 authored by Julia Lawall's avatar Julia Lawall Committed by Will Deacon
Browse files

iommu/arm-smmu: replace devm_request_and_ioremap by devm_ioremap_resource 



Use devm_ioremap_resource instead of devm_request_and_ioremap.

This was partly done using the semantic patch
scripts/coccinelle/api/devm_ioremap_resource.cocci

The error-handling code on the call to platform_get_resource was removed
manually, and the initialization of smmu->size was manually moved lower, to
take advantage of the NULL test on res performed by devm_ioremap_resource.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent d0e639c9

drivers/iommu/arm-smmu.c

+3 −8
Original line number Diff line number Diff line
@@ -1781,15 +1781,10 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) 
	smmu->dev = dev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "missing base address/size\n");

		return -ENODEV;

	}



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

	if (IS_ERR(smmu->base))

		return PTR_ERR(smmu->base);

	smmu->size = resource_size(res);

	smmu->base = devm_request_and_ioremap(dev, res);

	if (!smmu->base)

		return -EADDRNOTAVAIL;



	if (of_property_read_u32(dev->of_node, "#global-interrupts",

				 &smmu->num_global_irqs)) {