summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-09-02 10:25:13 +0900
committerVinod Koul <vinod.koul@intel.com>2013-09-02 17:35:34 +0530
commita576b7fe5e6027d02fe9c1320422c7e2b892f4d5 (patch)
tree5eee9545f2955f85922a6baca8600008869a1664 /drivers
parente9fd58de64248cfd49b8b0662ece635dba5ae909 (diff)
downloadblackbird-op-linux-a576b7fe5e6027d02fe9c1320422c7e2b892f4d5.tar.gz
blackbird-op-linux-a576b7fe5e6027d02fe9c1320422c7e2b892f4d5.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/k3dma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index ef7bc85d0b6d..a2c330f5f952 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) {
OpenPOWER on IntegriCloud