From patchwork Wed Jun 3 11:44:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 479900 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BD3A014027C for ; Wed, 3 Jun 2015 21:54:27 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b=jFlvI0vp; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754561AbbFCLyG (ORCPT ); Wed, 3 Jun 2015 07:54:06 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:34986 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754343AbbFCLoS (ORCPT ); Wed, 3 Jun 2015 07:44:18 -0400 Received: by lbbuc2 with SMTP id uc2so4988208lbb.2 for ; Wed, 03 Jun 2015 04:44:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id; bh=EO1aTuF/goIEIzHV+XvR0l0kicfzl7XP0ccFa8xpvrg=; b=jFlvI0vpd4Jap6stG7Dzl2N2ZHt307T1uJbAvFevEQ/pe2xSsZosPORReME9Q2/r8Z ecmJqoOBrdyd0mq6MsfCD+bVzfq8leBWBWF/Im72Vj2ASC5bimgEhATW08IRn4hpPjmb vMWrk8tUilB/RSJul9cFCbEtwWW4ru00Vk/vM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EO1aTuF/goIEIzHV+XvR0l0kicfzl7XP0ccFa8xpvrg=; b=MgwHIxsg9bvSgom9ZwDDSEMU4jtRDBlTCLQvy+M0hBNG0F04wcT+wx+Dd6FBPFHE7p pYjIhhMzsw+q2Y5KJBCI0LQ8Psb3zcrOmkx/DcSIKTcbjNenLVkxZocHFCuqs/okP9su l6tUAdF8Yj3VuQQwFRtxwQb2PUr5kCBe35pEjujovSr/tGWtYarAsKCmXC3K3Y5pQopM IIIDlw6Jj30BOwTAyi3q+M49DgvEvd9UiolnUBb6UemgOPze4GvIKYd37lZU5eN3jSz6 2Qg6UffEqiNVNv27fUoK+NciaujuFaFG46t/nRz81A1Gxa5GsSn9lRXF6MHq63LYzFCK tGNg== X-Gm-Message-State: ALoCoQlTL6/ZPtTU7tAm7KnEoiVsb0UBsPZXiwDNAOSXqor5Qnck4yV2IGE88DACBkvip0DQE87+ X-Received: by 10.112.156.231 with SMTP id wh7mr26924970lbb.118.1433331856886; Wed, 03 Jun 2015 04:44:16 -0700 (PDT) Received: from spencer.imf.au.dk ([130.225.20.51]) by mx.google.com with ESMTPSA id c5sm5757529lbd.49.2015.06.03.04.44.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 04:44:16 -0700 (PDT) From: Rasmus Villemoes To: Grant Grundler Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: tulip: rearrange order of searching for substrings Date: Wed, 3 Jun 2015 13:44:03 +0200 Message-Id: <1433331843-32301-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently, two of the branches are dead code, since an earlier smaller substring would have been found ("TP" in the "TP_NW" case and either of "BNC" and "AUI" in the "BNC_AUI" case). Rearrange the strstr() calls so that the longer strings are searched for first. Signed-off-by: Rasmus Villemoes --- This is rather old code; presumably nobody ever noticed or cared. So alternatively the dead branches can just be deleted. drivers/net/ethernet/dec/tulip/de4x5.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index badff181e719..8966f3159bb2 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c @@ -5189,16 +5189,16 @@ de4x5_parse_params(struct net_device *dev) if (strstr(p, "fdx") || strstr(p, "FDX")) lp->params.fdx = true; if (strstr(p, "autosense") || strstr(p, "AUTOSENSE")) { - if (strstr(p, "TP")) { - lp->params.autosense = TP; - } else if (strstr(p, "TP_NW")) { + if (strstr(p, "TP_NW")) { 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")) { lp->params.autosense = BNC; } else if (strstr(p, "AUI")) { lp->params.autosense = AUI; - } else if (strstr(p, "BNC_AUI")) { - lp->params.autosense = BNC; } else if (strstr(p, "10Mb")) { lp->params.autosense = _10Mb; } else if (strstr(p, "100Mb")) {