From: simon <xxm@rock-chips.com>
Date: Fri, 22 Aug 2014 01:30:26 +0000 (+0800)
Subject: rockchip: iommu: use devm_ioremap instead of ioremap when probe
X-Git-Tag: firefly_0821_release~4825
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=75bdc645cad8ae838796995f8cb69491869a5b6c;p=firefly-linux-kernel-4.4.55.git

rockchip: iommu: use devm_ioremap instead of ioremap when probe
---

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 3c1ca9d7c32b..ca87d01f95f8 100755
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1218,7 +1218,7 @@ for (i = 0; i < pdev->num_resources; i++, res++) {
 			ret = -ENOENT;
 			goto err_res;
 		}
-		data->res_bases[i] = ioremap(res->start, resource_size(res));
+		data->res_bases[i] = devm_ioremap(dev,res->start, resource_size(res));
 		dev_dbg(dev,"res->start = 0x%08x  ioremap to  data->res_bases[%d] = 0x%08x\n",
 			res->start, i, (unsigned int)data->res_bases[i]);
 		if (!data->res_bases[i]) {
@@ -1270,8 +1270,6 @@ for (i = 0; i < pdev->num_resources; i++, res++) {
 
 err_irq:
 err_res:
-	while (data->num_res_mem-- > 0)
-		devm_iounmap(dev,data->res_bases[data->num_res_mem]);
 err_init:
 err_alloc:
 	dev_err(dev, "Failed to initialize\n");