Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a92f7af3 authored by Fabio Estevam's avatar Fabio Estevam Committed by Herbert Xu
Browse files

crypto: caam - Remove unused dentry members 



Most of the dentry members from structure caam_drv_private
are never used at all, so it is safe to remove them.

Since debugfs_remove_recursive() is called, we don't need the
file entries.

Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Acked-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ac360faf

drivers/crypto/caam/ctrl.c

+30 −51
Original line number Diff line number Diff line
@@ -747,57 +747,36 @@ static int caam_probe(struct platform_device *pdev) 
		 caam_dpaa2 ? "yes" : "no");



#ifdef CONFIG_DEBUG_FS



	ctrlpriv->ctl_rq_dequeued =

		debugfs_create_file("rq_dequeued",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("rq_dequeued", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->req_dequeued,

			    &caam_fops_u64_ro);

	ctrlpriv->ctl_ob_enc_req =

		debugfs_create_file("ob_rq_encrypted",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("ob_rq_encrypted", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->ob_enc_req,

			    &caam_fops_u64_ro);

	ctrlpriv->ctl_ib_dec_req =

		debugfs_create_file("ib_rq_decrypted",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("ib_rq_decrypted", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->ib_dec_req,

			    &caam_fops_u64_ro);

	ctrlpriv->ctl_ob_enc_bytes =

		debugfs_create_file("ob_bytes_encrypted",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("ob_bytes_encrypted", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->ob_enc_bytes,

			    &caam_fops_u64_ro);

	ctrlpriv->ctl_ob_prot_bytes =

		debugfs_create_file("ob_bytes_protected",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("ob_bytes_protected", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->ob_prot_bytes,

			    &caam_fops_u64_ro);

	ctrlpriv->ctl_ib_dec_bytes =

		debugfs_create_file("ib_bytes_decrypted",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("ib_bytes_decrypted", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->ib_dec_bytes,

			    &caam_fops_u64_ro);

	ctrlpriv->ctl_ib_valid_bytes =

		debugfs_create_file("ib_bytes_validated",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("ib_bytes_validated", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->ib_valid_bytes,

			    &caam_fops_u64_ro);



	/* Controller level - global status values */

	ctrlpriv->ctl_faultaddr =

		debugfs_create_file("fault_addr",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("fault_addr", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->faultaddr,

			    &caam_fops_u32_ro);

	ctrlpriv->ctl_faultdetail =

		debugfs_create_file("fault_detail",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("fault_detail", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->faultdetail,

			    &caam_fops_u32_ro);

	ctrlpriv->ctl_faultstatus =

		debugfs_create_file("fault_status",

				    S_IRUSR | S_IRGRP | S_IROTH,

	debugfs_create_file("fault_status", S_IRUSR | S_IRGRP | S_IROTH,

			    ctrlpriv->ctl, &perfmon->status,

			    &caam_fops_u32_ro);

drivers/crypto/caam/intern.h

+0 −8
Original line number Diff line number Diff line
@@ -102,16 +102,8 @@ struct caam_drv_private { 
#ifdef CONFIG_DEBUG_FS

	struct dentry *dfs_root;

	struct dentry *ctl; /* controller dir */

	struct dentry *ctl_rq_dequeued, *ctl_ob_enc_req, *ctl_ib_dec_req;

	struct dentry *ctl_ob_enc_bytes, *ctl_ob_prot_bytes;

	struct dentry *ctl_ib_dec_bytes, *ctl_ib_valid_bytes;

	struct dentry *ctl_faultaddr, *ctl_faultdetail, *ctl_faultstatus;



	struct debugfs_blob_wrapper ctl_kek_wrap, ctl_tkek_wrap, ctl_tdsk_wrap;

	struct dentry *ctl_kek, *ctl_tkek, *ctl_tdsk;

#ifdef CONFIG_CAAM_QI

	struct dentry *qi_congested;

#endif

#endif

};

drivers/crypto/caam/qi.c

+2 −4
Original line number Diff line number Diff line
@@ -791,10 +791,8 @@ int caam_qi_init(struct platform_device *caam_pdev) 
	/* Done with the CGRs; restore the cpus allowed mask */

	set_cpus_allowed_ptr(current, &old_cpumask);

#ifdef CONFIG_DEBUG_FS

	ctrlpriv->qi_congested = debugfs_create_file("qi_congested", 0444,

						     ctrlpriv->ctl,

						     &times_congested,

						     &caam_fops_u64_ro);

	debugfs_create_file("qi_congested", 0444, ctrlpriv->ctl,

			    &times_congested, &caam_fops_u64_ro);

#endif

	dev_info(qidev, "Linux CAAM Queue I/F driver initialised\n");

	return 0;