summaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2014-04-08 06:54:22 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2014-04-16 14:40:11 +0200
commit2496be2eddd33e9d478d591501c97831554ef469 (patch)
tree447e06adfac20bcc5663eea1ffabef1a1050bf33 /drivers/crypto
parentcrypto: testmgr - add test cases for SHA-1, SHA-224, SHA-256 and AES-CCM (diff)
downloadlinux-2496be2eddd33e9d478d591501c97831554ef469.tar.xz
linux-2496be2eddd33e9d478d591501c97831554ef469.zip
crypto: omap-des - use devm_ioremap_resource()
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: Joel Fernandes <joelf@ti.com> Reviewed-by: Marek Vasut <marex@denx.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/omap-des.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index ec5f13162b73..4a13624bb82b 100644
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -1074,10 +1074,9 @@ static int omap_des_probe(struct platform_device *pdev)
if (err)
goto err_res;
- dd->io_base = devm_request_and_ioremap(dev, res);
- if (!dd->io_base) {
- dev_err(dev, "can't ioremap\n");
- err = -ENOMEM;
+ dd->io_base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(dd->io_base)) {
+ err = PTR_ERR(dd->io_base);
goto err_res;
}
dd->phys_base = res->start;