Skip to contentSkip to conversation

iommu/arm-smmu: use devm_ioremap_resource() instead of devm_request_and_ioremap()

PATCH New Jingoo Han 2 participants 3 messages Sep 2, 2013 – Sep 3, 2013 IOMMU

lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/1 iommu/arm-smmu: use devm_ioremap_resource() instead of devm_request_and_ioremap()

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

---
 drivers/iommu/arm-smmu.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/arm-smmu.c +3 -3
index f417e89..31c709c 100644
@@ -1786,9 +1786,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
 	}
 
 	smmu->size = resource_size(res);
-	smmu->base = devm_request_and_ioremap(dev, res);
-	if (!smmu->base)
-		return -EADDRNOTAVAIL;
+	smmu->base = devm_ioremap_resource(dev, res);
+	if (IS_ERR(smmu->base))
+		return PTR_ERR(smmu->base);
 
 	if (of_property_read_u32(dev->of_node, "#global-interrupts",
 				 &smmu->num_global_irqs)) {
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 iommu/arm-smmu: use devm_ioremap_resource() instead of devm_request_and_ioremap()

Hello,

Quoted 13 lines · Jingoo Han

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

---
 drivers/iommu/arm-smmu.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/arm-smmu.c +0 -0
index f417e89..31c709c 100644

drivers/iommu/arm-smmu.c static int arm_smmu_device_dt_probe(struct platform_device *pdev) · line 1791

Quoted 9 lines
drivers/iommu/arm-smmu.c +3 -3
@@ -1786,9 +1786,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
 	}
 
 	smmu->size = resource_size(res);
-	smmu->base = devm_request_and_ioremap(dev, res);
-	if (!smmu->base)
-		return -EADDRNOTAVAIL;
+	smmu->base = devm_ioremap_resource(dev, res);
+	if (IS_ERR(smmu->base))
+		return PTR_ERR(smmu->base);

Cheers, but I've already got a patch like this queued from Julia. I was going to send a pull request to Joerg after the merge window, since it's a bit late in the day for things like this at the moment.

Will

#2 lore raw

PATCH 1/1 iommu/arm-smmu: use devm_ioremap_resource() instead of devm_request_and_ioremap()

In reply to Jingoo Han

[Apologies if you receive this twice -- I've been having issues with email]

Quoted 13 lines · Jingoo Han

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

---
 drivers/iommu/arm-smmu.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/arm-smmu.c +0 -0
index f417e89..31c709c 100644

drivers/iommu/arm-smmu.c static int arm_smmu_device_dt_probe(struct platform_device *pdev) · line 1791

Quoted 9 lines
drivers/iommu/arm-smmu.c +3 -3
@@ -1786,9 +1786,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
 	}
 
 	smmu->size = resource_size(res);
-	smmu->base = devm_request_and_ioremap(dev, res);
-	if (!smmu->base)
-		return -EADDRNOTAVAIL;
+	smmu->base = devm_ioremap_resource(dev, res);
+	if (IS_ERR(smmu->base))
+		return PTR_ERR(smmu->base);

Cheers, but I've already got a patch like this queued from Julia. I was going to send a pull request to Joerg after the merge window, since it's a bit late in the day for things like this at the moment.

Will