diff mbox series

[v2] drivers: wireless: ath5k: fix parameter check in ath5k_debug_init_device()

Message ID 20230713033647.2109-1-duminjie@vivo.com (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show
Series [v2] drivers: wireless: ath5k: fix parameter check in ath5k_debug_init_device() | expand

Commit Message

Minjie Du July 13, 2023, 3:36 a.m. UTC
Make IS_ERR_OR_NULL() judge the debugfs_create_dir() function return
in ath5k_debug_init_device().

Signed-off-by: Minjie Du <duminjie@vivo.com>
Acked-by: Luis Chamberlain <mcgrof@kernel.org>
---
v1-v2:
use IS_ERR_OR_NULL() instead of IS_ERR()
---
 drivers/net/wireless/ath/ath5k/debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jiri Slaby July 13, 2023, 5:14 a.m. UTC | #1
On 13. 07. 23, 5:36, Minjie Du wrote:
> Make IS_ERR_OR_NULL() judge the debugfs_create_dir() function return
> in ath5k_debug_init_device().
> 
> Signed-off-by: Minjie Du <duminjie@vivo.com>
> Acked-by: Luis Chamberlain <mcgrof@kernel.org>
> ---
> v1-v2:
> use IS_ERR_OR_NULL() instead of IS_ERR()
> ---
>   drivers/net/wireless/ath/ath5k/debug.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
> index 4b41160e5..7c8823759 100644
> --- a/drivers/net/wireless/ath/ath5k/debug.c
> +++ b/drivers/net/wireless/ath/ath5k/debug.c
> @@ -982,7 +982,7 @@ ath5k_debug_init_device(struct ath5k_hw *ah)
>   	ah->debug.level = ath5k_debug;
>   
>   	phydir = debugfs_create_dir("ath5k", ah->hw->wiphy->debugfsdir);
> -	if (!phydir)
> +	if (IS_ERR_OR_NULL(phydir))

When can debugfs_create_dir() return NULL?

>   		return;
>   
>   	debugfs_create_file("debug", 0600, phydir, ah, &fops_debug);
Jiri Slaby July 13, 2023, 5:58 a.m. UTC | #2
On 13. 07. 23, 5:36, Minjie Du wrote:
> Make IS_ERR_OR_NULL() judge the debugfs_create_dir() function return
> in ath5k_debug_init_device().
> 
> Signed-off-by: Minjie Du <duminjie@vivo.com>
> Acked-by: Luis Chamberlain <mcgrof@kernel.org>
> ---
> v1-v2:
> use IS_ERR_OR_NULL() instead of IS_ERR()
> ---
>   drivers/net/wireless/ath/ath5k/debug.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
> index 4b41160e5..7c8823759 100644
> --- a/drivers/net/wireless/ath/ath5k/debug.c
> +++ b/drivers/net/wireless/ath/ath5k/debug.c
> @@ -982,7 +982,7 @@ ath5k_debug_init_device(struct ath5k_hw *ah)
>   	ah->debug.level = ath5k_debug;
>   
>   	phydir = debugfs_create_dir("ath5k", ah->hw->wiphy->debugfsdir);
> -	if (!phydir)
> +	if (IS_ERR_OR_NULL(phydir))
>   		return;

And actually, in this case, remove the check completely (as per docs).

thanks,
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 4b41160e5..7c8823759 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -982,7 +982,7 @@  ath5k_debug_init_device(struct ath5k_hw *ah)
 	ah->debug.level = ath5k_debug;
 
 	phydir = debugfs_create_dir("ath5k", ah->hw->wiphy->debugfsdir);
-	if (!phydir)
+	if (IS_ERR_OR_NULL(phydir))
 		return;
 
 	debugfs_create_file("debug", 0600, phydir, ah, &fops_debug);