Commit eceb5daf authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Herbert Xu
Browse files

crypto: caam - use devres to remove debugfs 



Use devres to remove debugfs and drop corresponding
debugfs_remove_recursive() 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 66e93b28

drivers/crypto/caam/ctrl.c

+14 −7
Original line number Diff line number Diff line
@@ -327,11 +327,6 @@ static int caam_remove(struct platform_device *pdev) 
	if (!ctrlpriv->mc_en && ctrlpriv->rng4_sh_init)

		deinstantiate_rng(ctrldev, ctrlpriv->rng4_sh_init);



	/* Shut down debug views */

#ifdef CONFIG_DEBUG_FS

	debugfs_remove_recursive(ctrlpriv->dfs_root);

#endif



	return 0;

}
@@ -563,6 +558,13 @@ static int init_clocks(struct device *dev, const struct caam_imx_data *data) 
	return devm_add_action_or_reset(dev, disable_clocks, ctrlpriv);

}



#ifdef CONFIG_DEBUG_FS

static void caam_remove_debugfs(void *root)

{

	debugfs_remove_recursive(root);

}

#endif



/* Probe routine for CAAM top (controller) level */

static int caam_probe(struct platform_device *pdev)

{
@@ -575,6 +577,7 @@ static int caam_probe(struct platform_device *pdev) 
	struct caam_drv_private *ctrlpriv;

#ifdef CONFIG_DEBUG_FS

	struct caam_perfmon *perfmon;

	struct dentry *dfs_root;

#endif

	u32 scfgr, comp_params;

	u8 rng_vid;
@@ -728,8 +731,12 @@ static int caam_probe(struct platform_device *pdev) 
	 */

	perfmon = (struct caam_perfmon __force *)&ctrl->perfmon;



	ctrlpriv->dfs_root = debugfs_create_dir(dev_name(dev), NULL);

	ctrlpriv->ctl = debugfs_create_dir("ctl", ctrlpriv->dfs_root);

	dfs_root = debugfs_create_dir(dev_name(dev), NULL);

	ret = devm_add_action_or_reset(dev, caam_remove_debugfs, dfs_root);

	if (ret)

		return ret;



	ctrlpriv->ctl = debugfs_create_dir("ctl", dfs_root);

#endif



	/* Check to see if (DPAA 1.x) QI present. If so, enable */

drivers/crypto/caam/intern.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ struct caam_drv_private { 
	 * variables at runtime.

	 */

#ifdef CONFIG_DEBUG_FS

	struct dentry *dfs_root;

	struct dentry *ctl; /* controller dir */

	struct debugfs_blob_wrapper ctl_kek_wrap, ctl_tkek_wrap, ctl_tdsk_wrap;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE