drivers/net: intel: iwlwifi: fix two parameters check in iwl_mei_dbgfs_register()

[PATCH v1] drivers/net: intel: iwlwifi: fix two parameters check in iwl_mei_dbgfs_register()

Posted by Minjie Du 2 years, 7 months ago

Make IS_ERR() judge the debugfs_create_dir() function return
in iwl_mei_dbgfs_register().

Signed-off-by: Minjie Du <duminjie@vivo.com>
---
 drivers/net/wireless/intel/iwlwifi/mei/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c
index 54445f39f..e5d203a62 100644
--- a/drivers/net/wireless/intel/iwlwifi/mei/main.c
+++ b/drivers/net/wireless/intel/iwlwifi/mei/main.c
@@ -1888,7 +1888,7 @@ static void iwl_mei_dbgfs_register(struct iwl_mei *mei)
 {
 	mei->dbgfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
 
-	if (!mei->dbgfs_dir)
+	if (IS_ERR(mei->dbgfs_dir))
 		return;
 
 	debugfs_create_ulong("status", S_IRUSR,
-- 
2.39.0

Re: [PATCH v1] drivers/net: intel: iwlwifi: fix two parameters check in iwl_mei_dbgfs_register()

Posted by Greenman, Gregory 2 years, 5 months ago

Hi,

On Wed, 2023-07-12 at 21:14 +0800, Minjie Du wrote:
> Make IS_ERR() judge the debugfs_create_dir() function return
> in iwl_mei_dbgfs_register().
> 
> Signed-off-by: Minjie Du <duminjie@vivo.com>
> ---
>  drivers/net/wireless/intel/iwlwifi/mei/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c
> index 54445f39f..e5d203a62 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mei/main.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mei/main.c
> @@ -1888,7 +1888,7 @@ static void iwl_mei_dbgfs_register(struct iwl_mei *mei)
>  {
>         mei->dbgfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
>  
> -       if (!mei->dbgfs_dir)
> +       if (IS_ERR(mei->dbgfs_dir))
>                 return;
>  
>         debugfs_create_ulong("status", S_IRUSR,

The title should be:

wifi: iwlwifi: mei: ...

Also, why two parameters? It only fixes dbgfs_dir?

Re: [PATCH v1] drivers/net: intel: iwlwifi: fix two parameters check in iwl_mei_dbgfs_register()

Posted by Kalle Valo 2 years, 5 months ago

"Greenman, Gregory" <gregory.greenman@intel.com> writes:

> Hi,
>
> On Wed, 2023-07-12 at 21:14 +0800, Minjie Du wrote:
>> Make IS_ERR() judge the debugfs_create_dir() function return
>> in iwl_mei_dbgfs_register().
>> 
>> Signed-off-by: Minjie Du <duminjie@vivo.com>
>> ---
>>  drivers/net/wireless/intel/iwlwifi/mei/main.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c
>> b/drivers/net/wireless/intel/iwlwifi/mei/main.c
>> index 54445f39f..e5d203a62 100644
>> --- a/drivers/net/wireless/intel/iwlwifi/mei/main.c
>> +++ b/drivers/net/wireless/intel/iwlwifi/mei/main.c
>> @@ -1888,7 +1888,7 @@ static void iwl_mei_dbgfs_register(struct iwl_mei *mei)
>>  {
>>         mei->dbgfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
>>  
>> -       if (!mei->dbgfs_dir)
>> +       if (IS_ERR(mei->dbgfs_dir))
>>                 return;
>>  
>>         debugfs_create_ulong("status", S_IRUSR,
>
> The title should be:
>
> wifi: iwlwifi: mei: ...
>
> Also, why two parameters? It only fixes dbgfs_dir?

It would be better to just remove the check, from debugfs_create_dir():

 * NOTE: it's expected that most callers should _ignore_ the errors returned
 * by this function. Other debugfs functions handle the fact that the "dentry"
 * passed to them could be an error and they don't crash in that case.
 * Drivers should generally work fine even if debugfs fails to init anyway.


-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH v1] drivers/net: intel: iwlwifi: fix two parameters check in iwl_mei_dbgfs_register()

Posted by Nicolas Escande 2 years, 7 months ago

On Wed Jul 12, 2023 at 3:14 PM CEST, Minjie Du wrote:
> Make IS_ERR() judge the debugfs_create_dir() function return
> in iwl_mei_dbgfs_register().
>
> Signed-off-by: Minjie Du <duminjie@vivo.com>
> ---
>  drivers/net/wireless/intel/iwlwifi/mei/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c
> index 54445f39f..e5d203a62 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mei/main.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mei/main.c
> @@ -1888,7 +1888,7 @@ static void iwl_mei_dbgfs_register(struct iwl_mei *mei)
>  {
>  	mei->dbgfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
>  
> -	if (!mei->dbgfs_dir)
> +	if (IS_ERR(mei->dbgfs_dir))
>  		return;

same as the other one

>  
>  	debugfs_create_ulong("status", S_IRUSR,