Skip to contentSkip to conversation

e1000e: Remove not useful `else' after a break or return

PATCH In review Baozhu Ni 2 participants 2 messages Jun 9, 2023 – Jun 13, 2023

Subsystems (3)
Networking Network drivers Intel Ethernet
lore
Share & tools
lore

Baozhu Ni

author
#0 lore raw

PATCH 1/1 e1000e: Remove not useful `else' after a break or return

`else' is not generally useful after a break or return

Signed-off-by Baozhu Ni <[email protected]>
---
 .../net/ethernet/intel/e1000e/80003es2lan.c   |  5 +-
 drivers/net/ethernet/intel/e1000e/ich8lan.c   | 59 +++++++++----------
 2 files changed, 31 insertions(+), 33 deletions(-)
drivers/net/ethernet/intel/e1000e/80003es2lan.c +2 -3
index be9c695dde12..f063e2bd48fa 100644
@@ -43,11 +43,10 @@ static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw)
 	if (hw->phy.media_type != e1000_media_type_copper) {
 		phy->type = e1000_phy_none;
 		return 0;
-	} else {
-		phy->ops.power_up = e1000_power_up_phy_copper;
-		phy->ops.power_down = e1000_power_down_phy_copper_80003es2lan;
 	}
 
+	phy->ops.power_up = e1000_power_up_phy_copper;
+	phy->ops.power_down = e1000_power_down_phy_copper_80003es2lan;
 	phy->addr = 1;
 	phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
 	phy->reset_delay_us = 100;
drivers/net/ethernet/intel/e1000e/ich8lan.c +29 -30

78 lines not on this page · raw message

Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 1 line · Baozhu Ni

`else' is not generally useful after a break or return

networking doesn't take checkpatch only fixes. While this doesn't explicitly reference checkpatch, the message and changes address solely checkpatch issues. Sorry.

Quoted 1 line
Signed-off-by Baozhu Ni <[email protected]>