From patchwork Wed Mar 25 04:07:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 454141 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 1AEE41400F1 for ; Wed, 25 Mar 2015 15:07:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6602B91AA7 for ; Wed, 25 Mar 2015 04:07:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I7mx31MUWAB1 for ; Wed, 25 Mar 2015 04:07:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 58CC891AB5 for ; Wed, 25 Mar 2015 04:07:10 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8FB5E1C1FC2 for ; Wed, 25 Mar 2015 04:07:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 890B8A2F1A for ; Wed, 25 Mar 2015 04:07:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uBuSYbISosRh for ; Wed, 25 Mar 2015 04:07:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2BEABA3015 for ; Wed, 25 Mar 2015 04:07:09 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 24 Mar 2015 21:07:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,462,1422950400"; d="scan'208";a="670178699" Received: from kmcrowe-mobl.amr.corp.intel.com (HELO jtkirshe-mobl.amr.corp.intel.com) ([10.252.205.47]) by orsmga001.jf.intel.com with ESMTP; 24 Mar 2015 21:07:08 -0700 From: Jeff Kirsher To: intel-wired-lan@lists.osuosl.org Date: Tue, 24 Mar 2015 21:07:06 -0700 Message-Id: <1427256426-24377-1-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.9.3 Cc: Dan Carpenter Subject: [Intel-wired-lan] [next-queue] igb: cleanup igb_enable_mas() a bit X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" From: Dan Carpenter Static checkers complain about this because we do: if (!(connsw & E1000_CONNSW_SERDESD)) { ... } else if (connsw & E1000_CONNSW_SERDESD) { ... } else { ... } Once you eliminate that E1000_CONNSW_SERDESD is set and not set then there aren't any other possibilities so the else statement is dead code. This function always returns zero so if you delete the "ret_val" variable, the code is shorter and more clear. Signed-off-by: Dan Carpenter --- drivers/net/ethernet/intel/igb/igb_main.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 0e07545..51def6e 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -1838,11 +1838,10 @@ static s32 igb_enable_mas(struct igb_adapter *adapter) { struct e1000_hw *hw = &adapter->hw; u32 connsw; - s32 ret_val = 0; connsw = rd32(E1000_CONNSW); - if (!(hw->phy.media_type == e1000_media_type_copper)) - return ret_val; + if (hw->phy.media_type != e1000_media_type_copper) + return 0; /* configure for SerDes media detect */ if (!(connsw & E1000_CONNSW_SERDESD)) { @@ -1850,15 +1849,8 @@ static s32 igb_enable_mas(struct igb_adapter *adapter) connsw |= E1000_CONNSW_AUTOSENSE_EN; wr32(E1000_CONNSW, connsw); wrfl(); - } else if (connsw & E1000_CONNSW_SERDESD) { - /* already SerDes, no need to enable anything */ - return ret_val; - } else { - netdev_info(adapter->netdev, - "MAS: Unable to configure feature, disabling..\n"); - adapter->flags &= ~IGB_FLAG_MAS_ENABLE; } - return ret_val; + return 0; } void igb_reset(struct igb_adapter *adapter)