summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/caam/ctrl.c
diff options
context:
space:
mode:
authorHoria Geantă <horia.geanta@nxp.com>2019-05-03 16:17:40 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2019-05-23 08:01:04 +0200
commit6b175685b4a12ab0aa048078bd7ca1fdb20ca766 (patch)
tree4d71d589f906c3be75dcdab9282e7d76cfd94a40 /drivers/crypto/caam/ctrl.c
parentcrypto: caam - convert top level drivers to libraries (diff)
downloadlinux-6b175685b4a12ab0aa048078bd7ca1fdb20ca766.tar.xz
linux-6b175685b4a12ab0aa048078bd7ca1fdb20ca766.zip
crypto: caam/qi - don't allocate an extra platform device
Use the controller device for caam/qi instead of allocating a new platform device. This is needed as a preparation to add support for working behind an SMMU. A platform device allocated using platform_device_register_full() is not completely set up - most importantly .dma_configure() is not called. Signed-off-by: Horia Geantă <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/caam/ctrl.c')
-rw-r--r--drivers/crypto/caam/ctrl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 36c2f15100a4..38bcbbccdfda 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -323,8 +323,8 @@ static int caam_remove(struct platform_device *pdev)
of_platform_depopulate(ctrldev);
#ifdef CONFIG_CAAM_QI
- if (ctrlpriv->qidev)
- caam_qi_shutdown(ctrlpriv->qidev);
+ if (ctrlpriv->qi_init)
+ caam_qi_shutdown(ctrldev);
#endif
/*
@@ -900,8 +900,8 @@ caam_remove:
shutdown_qi:
#ifdef CONFIG_CAAM_QI
- if (ctrlpriv->qidev)
- caam_qi_shutdown(ctrlpriv->qidev);
+ if (ctrlpriv->qi_init)
+ caam_qi_shutdown(dev);
#endif
iounmap_ctrl:
iounmap(ctrl);