diff mbox

crypto: caam/qi - Remove unused 'qi_congested' entry

Message ID 1501368901-8248-1-git-send-email-festevam@gmail.com (mailing list archive)
State Superseded
Delegated to: Herbert Xu
Headers show

Commit Message

Fabio Estevam July 29, 2017, 10:55 p.m. UTC
From: Fabio Estevam <fabio.estevam@nxp.com>

'qi_congested' member from structure caam_drv_private
is never used at all, so it is safe to remove it.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 drivers/crypto/caam/intern.h | 3 ---
 drivers/crypto/caam/qi.c     | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

Comments

Horia Geanta July 31, 2017, 7:22 a.m. UTC | #1
On 7/30/2017 1:55 AM, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> 'qi_congested' member from structure caam_drv_private
> is never used at all, so it is safe to remove it.

Agree, though I would remove all the other dentry members not currently
used - since debugfs_remove_recursive() is called, we don't need the
file entries.

> 
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
>  drivers/crypto/caam/intern.h | 3 ---
>  drivers/crypto/caam/qi.c     | 6 ++----
>  2 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h
> index 9e3f3e0..9625b2d 100644
> --- a/drivers/crypto/caam/intern.h
> +++ b/drivers/crypto/caam/intern.h
> @@ -109,9 +109,6 @@ struct caam_drv_private {
>  
>  	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
>  };
>  
> diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c
> index 6d5a010..b2f7a42 100644
> --- a/drivers/crypto/caam/qi.c
> +++ b/drivers/crypto/caam/qi.c
> @@ -793,10 +793,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);

Either here or in a different patch the return value of debugfs_create_*
functions should be checked, such that if IS_ERR_OR_NULL(ret) we could
print a warning.

Thanks,
Horia
Fabio Estevam July 31, 2017, 12:14 p.m. UTC | #2
On Mon, Jul 31, 2017 at 4:22 AM, Horia Geantă <horia.geanta@nxp.com> wrote:
> On 7/30/2017 1:55 AM, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@nxp.com>
>>
>> 'qi_congested' member from structure caam_drv_private
>> is never used at all, so it is safe to remove it.
>
> Agree, though I would remove all the other dentry members not currently
> used - since debugfs_remove_recursive() is called, we don't need the
> file entries.

Ok, it makes sense. Wil do it in v2.

>> diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c
>> index 6d5a010..b2f7a42 100644
>> --- a/drivers/crypto/caam/qi.c
>> +++ b/drivers/crypto/caam/qi.c
>> @@ -793,10 +793,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);
>
> Either here or in a different patch the return value of debugfs_create_*
> functions should be checked, such that if IS_ERR_OR_NULL(ret) we could
> print a warning.

I will leave the error checking for a separate patch then.
diff mbox

Patch

diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h
index 9e3f3e0..9625b2d 100644
--- a/drivers/crypto/caam/intern.h
+++ b/drivers/crypto/caam/intern.h
@@ -109,9 +109,6 @@  struct caam_drv_private {
 
 	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
 };
 
diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c
index 6d5a010..b2f7a42 100644
--- a/drivers/crypto/caam/qi.c
+++ b/drivers/crypto/caam/qi.c
@@ -793,10 +793,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;