1 From 76087c548649ea0fae04a0538f9de12546c5c680 Mon Sep 17 00:00:00 2001
2 From: Andrey Smirnov <andrew.smirnov@gmail.com>
3 Date: Tue, 22 Oct 2019 08:30:08 -0700
4 Subject: [PATCH] crypto: caam - use devres to unmap memory
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Use devres to unmap memory and drop corresponding iounmap() call.
11 Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
12 Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
13 Cc: Chris Healy <cphealy@gmail.com>
14 Cc: Lucas Stach <l.stach@pengutronix.de>
15 Cc: Horia Geantă <horia.geanta@nxp.com>
16 Cc: Herbert Xu <herbert@gondor.apana.org.au>
17 Cc: Iuliana Prodan <iuliana.prodan@nxp.com>
18 Cc: linux-crypto@vger.kernel.org
19 Cc: linux-kernel@vger.kernel.org
20 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
21 (cherry picked from commit 66e93b28075d3cae568ed97ef78789afa5a6eb36)
23 drivers/crypto/caam/ctrl.c | 28 +++++++++-------------------
24 1 file changed, 9 insertions(+), 19 deletions(-)
26 --- a/drivers/crypto/caam/ctrl.c
27 +++ b/drivers/crypto/caam/ctrl.c
28 @@ -308,11 +308,9 @@ static int caam_remove(struct platform_d
30 struct device *ctrldev;
31 struct caam_drv_private *ctrlpriv;
32 - struct caam_ctrl __iomem *ctrl;
35 ctrlpriv = dev_get_drvdata(ctrldev);
36 - ctrl = (struct caam_ctrl __iomem *)ctrlpriv->ctrl;
38 /* Remove platform devices under the crypto node */
39 of_platform_depopulate(ctrldev);
40 @@ -334,9 +332,6 @@ static int caam_remove(struct platform_d
41 debugfs_remove_recursive(ctrlpriv->dfs_root);
44 - /* Unmap controller region */
50 @@ -611,10 +606,11 @@ static int caam_probe(struct platform_de
52 /* Get configuration properties from device tree */
53 /* First, get register page */
54 - ctrl = of_iomap(nprop, 0);
56 + ctrl = devm_of_iomap(dev, nprop, 0, NULL);
57 + ret = PTR_ERR_OR_ZERO(ctrl);
59 dev_err(dev, "caam: of_iomap() failed\n");
64 caam_little_end = !(bool)(rd_reg32(&ctrl->perfmon.status) &
65 @@ -632,22 +628,18 @@ static int caam_probe(struct platform_de
66 if (ctrlpriv->qi_present && !caam_dpaa2) {
67 ret = qman_is_probed();
69 - ret = -EPROBE_DEFER;
71 + return -EPROBE_DEFER;
73 dev_err(dev, "failing probe due to qman probe error\n");
79 ret = qman_portals_probed();
81 - ret = -EPROBE_DEFER;
83 + return -EPROBE_DEFER;
85 dev_err(dev, "failing probe due to qman portals probe error\n");
92 @@ -720,7 +712,7 @@ static int caam_probe(struct platform_de
93 ret = dma_set_mask_and_coherent(dev, caam_get_dma_mask(dev));
95 dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);
100 ctrlpriv->era = caam_get_era(ctrl);
101 @@ -925,8 +917,6 @@ shutdown_qi:
102 if (ctrlpriv->qi_init)
103 caam_qi_shutdown(dev);