[PATCH] ath11k: simplify if-if to if-else

[PATCH] ath11k: simplify if-if to if-else

[Yihao Han]

Replace `if (!ab->is_reset)` with `else` for simplification
and add curly brackets according to the kernel coding style:

"Do not unnecessarily use braces where a single statement will do."

...

"This does not apply if only one branch of a conditional statement is
a single statement; in the latter case use braces in both branches"

Please refer to:
https://www.kernel.org/doc/html/v5.17-rc8/process/coding-style.html

Signed-off-by: Yihao Han <hanyihao@vivo.com>
---
 drivers/net/wireless/ath/ath11k/core.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index cbac1919867f..80009482165a 100644
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -1532,8 +1532,7 @@ static void ath11k_core_restart(struct work_struct *work)
 
 	if (ab->is_reset)
 		complete_all(&ab->reconfigure_complete);
-
-	if (!ab->is_reset)
+	else
 		ath11k_core_post_reconfigure_recovery(ab);
 }
 
-- 
2.17.1

Re: [PATCH] ath11k: simplify if-if to if-else

[Benjamin Poirier]

On 2022-04-14 02:20 -0700, Yihao Han wrote:
> Replace `if (!ab->is_reset)` with `else` for simplification
> and add curly brackets according to the kernel coding style:
> 
> "Do not unnecessarily use braces where a single statement will do."
> 
> ...
> 
> "This does not apply if only one branch of a conditional statement is
> a single statement; in the latter case use braces in both branches"
> 
> Please refer to:
> https://www.kernel.org/doc/html/v5.17-rc8/process/coding-style.html

Same comment about the curly brackets part of the log as for the qlcnic
patch, it doesn't match the changes.

> 
> Signed-off-by: Yihao Han <hanyihao@vivo.com>
> ---
>  drivers/net/wireless/ath/ath11k/core.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
> index cbac1919867f..80009482165a 100644
> --- a/drivers/net/wireless/ath/ath11k/core.c
> +++ b/drivers/net/wireless/ath/ath11k/core.c
> @@ -1532,8 +1532,7 @@ static void ath11k_core_restart(struct work_struct *work)
>  
>  	if (ab->is_reset)
>  		complete_all(&ab->reconfigure_complete);
> -
> -	if (!ab->is_reset)
> +	else
>  		ath11k_core_post_reconfigure_recovery(ab);
>  }

It seems there is no synchronization around is_reset but is it
guaranteed that it cannot be changed by ath11k_core_reset() between the
two tests? I'm not familiar with the driver.

Re: [PATCH] ath11k: simplify if-if to if-else

[Wen Gong]

On 4/15/2022 2:16 PM, Benjamin Poirier wrote:
> On 2022-04-14 02:20 -0700, Yihao Han wrote:
...
> It seems there is no synchronization around is_reset but is it
> guaranteed that it cannot be changed by ath11k_core_reset() between the
> two tests? I'm not familiar with the driver.

ath11k_core_reset() has logic to avoid muti-reset in the same time.

it means it has one recovery work doing for each time.