From: Jingoo Han <jg1.han@samsung.com>
Date: Mon, 2 Sep 2013 01:25:13 +0000 (+0900)
Subject: dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()
X-Git-Tag: upstream/snapshot3+hdmi~4358^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a576b7fe5e6027d02fe9c1320422c7e2b892f4d5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

dma: k3dma: 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().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---

diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index ef7bc85..a2c330f 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -673,9 +673,9 @@ static int k3_dma_probe(struct platform_device *op)
 	if (!d)
 		return -ENOMEM;
 
-	d->base = devm_request_and_ioremap(&op->dev, iores);
-	if (!d->base)
-		return -EADDRNOTAVAIL;
+	d->base = devm_ioremap_resource(&op->dev, iores);
+	if (IS_ERR(d->base))
+		return PTR_ERR(d->base);
 
 	of_id = of_match_device(k3_pdma_dt_ids, &op->dev);
 	if (of_id) {