Skip to contentSkip to conversation

net: tulip: de4x5: Optimize if branch in de4x5_parse_params

PATCH In review Meng Tang 2 participants 2 messages Mar 15, 2022

Subsystems (3)
lore
Share & tools
lore

Meng Tang

author
#0 lore raw

PATCH 1/1 net: tulip: de4x5: Optimize if branch in de4x5_parse_params

In the de4x5_parse_params, 'if (strstr(p, "BNC_AUI"))' condition and 'if (strstr(p, "BNC_AUI"))' condition are both execute the statement 'lp->params.autosense = BNC', these two conditions can be combined.

In addition, in the current code logic, when p = "BNC", the judgments need to be executed four times. In order to simplify the execution process and keep the original code design, I used the statement which is 'if (strstr(p, "BNC") || strstr(p, "BNC_AUI"))' to deal with it, after that once 'strstr(p, "BNC")' is established, we no longer need to judge whether 'strstr(p, "BNC_AUI")' is true(not NULL).

In this way, we can execute the judgment statement one time less.

---
 drivers/net/ethernet/dec/tulip/de4x5.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/dec/tulip/de4x5.c +1 -3
index 71730ef4cd57..5900b8ef7f6f 100644
@@ -5208,9 +5208,7 @@ de4x5_parse_params(struct net_device *dev)
 		lp->params.autosense = TP_NW;
 	    } else if (strstr(p, "TP")) {
 		lp->params.autosense = TP;
-	    } else if (strstr(p, "BNC_AUI")) {
-		lp->params.autosense = BNC;
-	    } else if (strstr(p, "BNC")) {
+	    } else if (strstr(p, "BNC") || strstr(p, "BNC_AUI")) {
 		lp->params.autosense = BNC;
 	    } else if (strstr(p, "AUI")) {
 		lp->params.autosense = AUI;
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 11 lines · On Tue, 15 Mar 2022 15:49:52 +0800 Meng Tang wrote:

In the de4x5_parse_params, 'if (strstr(p, "BNC_AUI"))' condition and 'if (strstr(p, "BNC_AUI"))' condition are both execute the statement 'lp->params.autosense = BNC', these two conditions can be combined.

In addition, in the current code logic, when p = "BNC", the judgments need to be executed four times. In order to simplify the execution process and keep the original code design, I used the statement which is 'if (strstr(p, "BNC") || strstr(p, "BNC_AUI"))' to deal with it, after that once 'strstr(p, "BNC")' is established, we no longer need to judge whether 'strstr(p, "BNC_AUI")' is true(not NULL).

Quoted 3 lines

In this way, we can execute the judgment statement one time less.

This is ancient code, let's leave it be.