2023-07-13 08:46:31

by Minjie Du

Subject: [PATCH v4] wifi: ath5k: remove parameter check in ath5k_debug_init_device()

The parameter 'phydir' error check is mistake.
debugfs_create_file() will return early if 'phydir' is an error pointer,
so the error check is removed.

Signed-off-by: Minjie Du <[email protected]>
---
v1: use IS_ERR() to error check.
v2: use IS_ERR_OR_NULL() to error check.
v3: remove the error check.
v4: fix the patch format.
---
drivers/net/wireless/ath/ath5k/debug.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 4b41160e5..ec130510a 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -982,8 +982,6 @@ ath5k_debug_init_device(struct ath5k_hw *ah)
ah->debug.level = ath5k_debug;

phydir = debugfs_create_dir("ath5k", ah->hw->wiphy->debugfsdir);
- if (!phydir)
- return;

debugfs_create_file("debug", 0600, phydir, ah, &fops_debug);
debugfs_create_file("registers", 0400, phydir, ah, &registers_fops);
--
2.39.0

2023-07-14 06:27:35

by Jiri Slaby

Subject: Re: [PATCH v4] wifi: ath5k: remove parameter check in ath5k_debug_init_device()

On 13. 07. 23, 10:24, Minjie Du wrote:
> The parameter 'phydir' error check is mistake.

It's not actually a parameter.

> debugfs_create_file() will return early if 'phydir' is an error pointer,
> so the error check is removed.

What about something like:
Subject: wifi: ath5k: remove phydir check from ath5k_debug_init_device()

'phydir' returned from debugfs_create_dir() is checked against NULL. As
the debugfs API returns an error pointer, the returned value can never
be NULL.

So instead, remove the check completely as it is unneeded as per
documentation. (Other debugfs calls are a nop in the error case.)

?

Or something like that, feel free to reword.


> Signed-off-by: Minjie Du <[email protected]>
> ---
> v1: use IS_ERR() to error check.
> v2: use IS_ERR_OR_NULL() to error check.
> v3: remove the error check.
> v4: fix the patch format.
> ---
> drivers/net/wireless/ath/ath5k/debug.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
> index 4b41160e5..ec130510a 100644
> --- a/drivers/net/wireless/ath/ath5k/debug.c
> +++ b/drivers/net/wireless/ath/ath5k/debug.c
> @@ -982,8 +982,6 @@ ath5k_debug_init_device(struct ath5k_hw *ah)
> ah->debug.level = ath5k_debug;
>
> phydir = debugfs_create_dir("ath5k", ah->hw->wiphy->debugfsdir);
> - if (!phydir)
> - return;
>
> debugfs_create_file("debug", 0600, phydir, ah, &fops_debug);
> debugfs_create_file("registers", 0400, phydir, ah, &registers_fops);

--
js
suse labs