From a576b7fe5e6027d02fe9c1320422c7e2b892f4d5 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Mon, 2 Sep 2013 10:25:13 +0900 Subject: [PATCH] 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 Acked-by: Zhangfei Gao Signed-off-by: Vinod Koul --- drivers/dma/k3dma.c | 6 +++--- 1 file 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) { -- 2.20.1