[PATCH] scsi: fcoe: simplify if-if to if-else

Yihao Han posted 1 patch 4 years, 1 month ago
drivers/scsi/fcoe/fcoe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] scsi: fcoe: simplify if-if to if-else
Posted by Yihao Han 4 years, 1 month ago
Replace `if (!is_zero_ether_addr(mac))` 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/scsi/fcoe/fcoe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 44ca6110213c..983e00135fea 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -2580,7 +2580,7 @@ static void fcoe_flogi_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg)
 	/* pre-FIP */
 	if (is_zero_ether_addr(mac))
 		fcoe_ctlr_recv_flogi(fip, lport, fp);
-	if (!is_zero_ether_addr(mac))
+	else
 		fcoe_update_src_mac(lport, mac);
 done:
 	fc_lport_flogi_resp(seq, fp, lport);
-- 
2.17.1
Re: [PATCH] scsi: fcoe: simplify if-if to if-else
Posted by Martin K. Petersen 4 years ago
On Fri, 8 Apr 2022 01:12:37 -0700, Yihao Han wrote:

> Replace `if (!is_zero_ether_addr(mac))` 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."
> 
> ...
> 
> [...]

Applied to 5.19/scsi-queue, thanks!

[1/1] scsi: fcoe: simplify if-if to if-else
      https://git.kernel.org/mkp/scsi/c/65db22e505c4

-- 
Martin K. Petersen	Oracle Linux Engineering
Re: [PATCH] scsi: fcoe: simplify if-if to if-else
Posted by Martin K. Petersen 4 years ago
Yihao,

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

Applied to 5.19/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering