From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) by dpdk.org (Postfix) with ESMTP id DC848C486 for ; Fri, 24 Jul 2015 19:06:24 +0200 (CEST) Received: by pdbbh15 with SMTP id bh15so16335641pdb.1 for ; Fri, 24 Jul 2015 10:06:24 -0700 (PDT) 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:in-reply-to :references; bh=7l+/qaX1j76b9mCxACD2kZxmeaWJFhcaqSisEBtD3ZA=; b=MuHvsFCrP7FNu2K981FyCIJbiI/i8nzzSngIU+YMCyKpFCYpGe7N/6Jt9wP34BE2J+ YPL9bvRkczyAT3NiAoVs+6hjFASWZejQGVgOxwOIEiH9snWAslFROsHHO8i2mCwLMaoQ wzCSNhB6dHR4T6zFJ90Y2TQPAud5DVHBDTHk4RS4X08ySZep/5M6dlWxqia+02g6dH4Q 5PfFoP2KgJ0am60vxRnSqOgOpFb4t5xR/y6AcU4uvtLvKHRDcbLQhCWQk0SOQDrl7wwI toe265vT1ZRScmt6PCIVbXzOagYtbeKntQEAlg9mJRPOeF8Gunay3kJrWWdqxtrDs/ea sizg== X-Gm-Message-State: ALoCoQk169DxTtWosuOA4oUbma4vRyvV9+38TyFB8kUXokgYY4mPNxRRg06uYbj48FCSsFMhi2nV X-Received: by 10.70.48.98 with SMTP id k2mr33590614pdn.69.1437757584208; Fri, 24 Jul 2015 10:06:24 -0700 (PDT) Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by smtp.gmail.com with ESMTPSA id ra10sm15635403pab.19.2015.07.24.10.06.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Jul 2015 10:06:23 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Date: Fri, 24 Jul 2015 10:06:18 -0700 Message-Id: <1437757584-15502-6-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437757584-15502-1-git-send-email-stephen@networkplumber.org> References: <1437757584-15502-1-git-send-email-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 05/11] kni: eliminate unnecessary return variables X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2015 17:06:25 -0000 If function just sets a variable (and never changes it) and then returns that value, just move the constant to return. Found with returnvar.cocci Signed-off-by: Stephen Hemminger --- lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c | 16 +++++----------- lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 9 ++++----- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c index b8c9a13..e3a874b 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c @@ -876,7 +876,6 @@ out: static s32 e1000_set_d0_lplu_state_82580(struct e1000_hw *hw, bool active) { struct e1000_phy_info *phy = &hw->phy; - s32 ret_val = E1000_SUCCESS; u32 data; DEBUGFUNC("e1000_set_d0_lplu_state_82580"); @@ -904,7 +903,7 @@ static s32 e1000_set_d0_lplu_state_82580(struct e1000_hw *hw, bool active) } E1000_WRITE_REG(hw, E1000_82580_PHY_POWER_MGMT, data); - return ret_val; + return E1000_SUCCESS; } /** @@ -924,7 +923,6 @@ static s32 e1000_set_d0_lplu_state_82580(struct e1000_hw *hw, bool active) s32 e1000_set_d3_lplu_state_82580(struct e1000_hw *hw, bool active) { struct e1000_phy_info *phy = &hw->phy; - s32 ret_val = E1000_SUCCESS; u32 data; DEBUGFUNC("e1000_set_d3_lplu_state_82580"); @@ -952,7 +950,7 @@ s32 e1000_set_d3_lplu_state_82580(struct e1000_hw *hw, bool active) } E1000_WRITE_REG(hw, E1000_82580_PHY_POWER_MGMT, data); - return ret_val; + return E1000_SUCCESS; } /** @@ -1112,7 +1110,6 @@ static void e1000_release_swfw_sync_82575(struct e1000_hw *hw, u16 mask) static s32 e1000_get_cfg_done_82575(struct e1000_hw *hw) { s32 timeout = PHY_CFG_TIMEOUT; - s32 ret_val = E1000_SUCCESS; u32 mask = E1000_NVM_CFG_DONE_PORT_0; DEBUGFUNC("e1000_get_cfg_done_82575"); @@ -1137,7 +1134,7 @@ static s32 e1000_get_cfg_done_82575(struct e1000_hw *hw) (hw->phy.type == e1000_phy_igp_3)) e1000_phy_init_script_igp3(hw); - return ret_val; + return E1000_SUCCESS; } /** @@ -2786,7 +2783,6 @@ s32 e1000_read_emi_reg(struct e1000_hw *hw, u16 addr, u16 *data) **/ s32 e1000_set_eee_i350(struct e1000_hw *hw) { - s32 ret_val = E1000_SUCCESS; u32 ipcnfg, eeer; DEBUGFUNC("e1000_set_eee_i350"); @@ -2818,8 +2814,7 @@ s32 e1000_set_eee_i350(struct e1000_hw *hw) E1000_READ_REG(hw, E1000_IPCNFG); E1000_READ_REG(hw, E1000_EEER); out: - - return ret_val; + return E1000_SUCCESS; } /** @@ -2986,7 +2981,6 @@ void e1000_write_vfta_i350(struct e1000_hw *hw, u32 offset, u32 value) **/ s32 e1000_set_i2c_bb(struct e1000_hw *hw) { - s32 ret_val = E1000_SUCCESS; u32 ctrl_ext, i2cparams; DEBUGFUNC("e1000_set_i2c_bb"); @@ -3003,7 +2997,7 @@ s32 e1000_set_i2c_bb(struct e1000_hw *hw) E1000_WRITE_REG(hw, E1000_I2CPARAMS, i2cparams); E1000_WRITE_FLUSH(hw); - return ret_val; + return E1000_SUCCESS; } /** diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c index eed8df6..0c04787 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c @@ -1859,7 +1859,6 @@ static s32 igb_enable_mas(struct igb_adapter *adapter) { struct e1000_hw *hw = &adapter->hw; u32 connsw; - s32 ret_val = E1000_SUCCESS; connsw = E1000_READ_REG(hw, E1000_CONNSW); if (hw->phy.media_type == e1000_media_type_copper) { @@ -1871,7 +1870,7 @@ static s32 igb_enable_mas(struct igb_adapter *adapter) E1000_WRITE_FLUSH(hw); } else if (connsw & E1000_CONNSW_SERDESD) { /* already SerDes, no need to enable anything */ - return ret_val; + return E1000_SUCCESS; } else { dev_info(pci_dev_to_dev(adapter->pdev), "%s:MAS: Unable to configure feature, disabling..\n", @@ -1879,7 +1878,7 @@ static s32 igb_enable_mas(struct igb_adapter *adapter) adapter->flags &= ~IGB_FLAG_MAS_ENABLE; } } - return ret_val; + return E1000_SUCCESS; } void igb_reset(struct igb_adapter *adapter) @@ -2424,14 +2423,14 @@ int igb_init_vmdq_netdevs(struct igb_adapter *adapter) int igb_remove_vmdq_netdevs(struct igb_adapter *adapter) { - int pool, err = 0; + int pool; for (pool = 1; pool < adapter->vmdq_pools; pool++) { unregister_netdev(adapter->vmdq_netdev[pool-1]); free_netdev(adapter->vmdq_netdev[pool-1]); adapter->vmdq_netdev[pool-1] = NULL; } - return err; + return 0; } #endif /* CONFIG_IGB_VMDQ_NETDEV */ -- 2.1.4