Commit 66e93b28 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Herbert Xu

crypto: caam - use devres to unmap memory

Use devres to unmap memory and drop corresponding iounmap() call.
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Horia Geantă <horia.geanta@nxp.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Iuliana Prodan <iuliana.prodan@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fbbfb3f8
...@@ -308,11 +308,9 @@ static int caam_remove(struct platform_device *pdev) ...@@ -308,11 +308,9 @@ static int caam_remove(struct platform_device *pdev)
{ {
struct device *ctrldev; struct device *ctrldev;
struct caam_drv_private *ctrlpriv; struct caam_drv_private *ctrlpriv;
struct caam_ctrl __iomem *ctrl;
ctrldev = &pdev->dev; ctrldev = &pdev->dev;
ctrlpriv = dev_get_drvdata(ctrldev); ctrlpriv = dev_get_drvdata(ctrldev);
ctrl = (struct caam_ctrl __iomem *)ctrlpriv->ctrl;
/* Remove platform devices under the crypto node */ /* Remove platform devices under the crypto node */
of_platform_depopulate(ctrldev); of_platform_depopulate(ctrldev);
...@@ -334,9 +332,6 @@ static int caam_remove(struct platform_device *pdev) ...@@ -334,9 +332,6 @@ static int caam_remove(struct platform_device *pdev)
debugfs_remove_recursive(ctrlpriv->dfs_root); debugfs_remove_recursive(ctrlpriv->dfs_root);
#endif #endif
/* Unmap controller region */
iounmap(ctrl);
return 0; return 0;
} }
...@@ -611,10 +606,11 @@ static int caam_probe(struct platform_device *pdev) ...@@ -611,10 +606,11 @@ static int caam_probe(struct platform_device *pdev)
/* Get configuration properties from device tree */ /* Get configuration properties from device tree */
/* First, get register page */ /* First, get register page */
ctrl = of_iomap(nprop, 0); ctrl = devm_of_iomap(dev, nprop, 0, NULL);
if (!ctrl) { ret = PTR_ERR_OR_ZERO(ctrl);
if (ret) {
dev_err(dev, "caam: of_iomap() failed\n"); dev_err(dev, "caam: of_iomap() failed\n");
return -ENOMEM; return ret;
} }
caam_little_end = !(bool)(rd_reg32(&ctrl->perfmon.status) & caam_little_end = !(bool)(rd_reg32(&ctrl->perfmon.status) &
...@@ -632,22 +628,18 @@ static int caam_probe(struct platform_device *pdev) ...@@ -632,22 +628,18 @@ static int caam_probe(struct platform_device *pdev)
if (ctrlpriv->qi_present && !caam_dpaa2) { if (ctrlpriv->qi_present && !caam_dpaa2) {
ret = qman_is_probed(); ret = qman_is_probed();
if (!ret) { if (!ret) {
ret = -EPROBE_DEFER; return -EPROBE_DEFER;
goto iounmap_ctrl;
} else if (ret < 0) { } else if (ret < 0) {
dev_err(dev, "failing probe due to qman probe error\n"); dev_err(dev, "failing probe due to qman probe error\n");
ret = -ENODEV; return -ENODEV;
goto iounmap_ctrl;
} }
ret = qman_portals_probed(); ret = qman_portals_probed();
if (!ret) { if (!ret) {
ret = -EPROBE_DEFER; return -EPROBE_DEFER;
goto iounmap_ctrl;
} else if (ret < 0) { } else if (ret < 0) {
dev_err(dev, "failing probe due to qman portals probe error\n"); dev_err(dev, "failing probe due to qman portals probe error\n");
ret = -ENODEV; return -ENODEV;
goto iounmap_ctrl;
} }
} }
#endif #endif
...@@ -722,7 +714,7 @@ static int caam_probe(struct platform_device *pdev) ...@@ -722,7 +714,7 @@ static int caam_probe(struct platform_device *pdev)
ret = dma_set_mask_and_coherent(dev, caam_get_dma_mask(dev)); ret = dma_set_mask_and_coherent(dev, caam_get_dma_mask(dev));
if (ret) { if (ret) {
dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret); dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);
goto iounmap_ctrl; return ret;
} }
ctrlpriv->era = caam_get_era(ctrl); ctrlpriv->era = caam_get_era(ctrl);
...@@ -927,8 +919,6 @@ static int caam_probe(struct platform_device *pdev) ...@@ -927,8 +919,6 @@ static int caam_probe(struct platform_device *pdev)
if (ctrlpriv->qi_init) if (ctrlpriv->qi_init)
caam_qi_shutdown(dev); caam_qi_shutdown(dev);
#endif #endif
iounmap_ctrl:
iounmap(ctrl);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment