From patchwork Mon Jan 9 23:30:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 19035 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A7BA3F60E; Tue, 10 Jan 2017 00:31:13 +0100 (CET) Received: from mail-pf0-f177.google.com (mail-pf0-f177.google.com [209.85.192.177]) by dpdk.org (Postfix) with ESMTP id 4C4EA3277 for ; Tue, 10 Jan 2017 00:30:34 +0100 (CET) Received: by mail-pf0-f177.google.com with SMTP id y143so14410373pfb.0 for ; Mon, 09 Jan 2017 15:30:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N8Ms+wGOH+6PXxLl8QiUgrkZ/h+OaBcn8fYxiuqMxDc=; b=i2lOzcmnqtAmkDFuDEi/wN+odEoGy1Su5Gb2SxV7iv2vrNpdhGARaERIjyO7HI3imc X/9KrBLwsI5N8MXHeKJbLR9Yc4Et1nvVjItoF61A9R0nZ1i9W7NHeLO3hNuFKKH8w9j5 tO8eJAjpHQy0poztfOgg/RaElJGgSg0i0rWfduYUibxb4WfZ+DxQP7X5em6FRUSJlZyb OfSzHRTSNW8q7jBDv91Svo5n2R9NpfEgJslUVO9S8IjJA/dF3OsC7wzDnygv1avgLg7z 72C98+18MAwpwfujTjx7LNQWX/EDT6OC5MVJ27ZIKSRSG3xiGYLW6HmBR4jsVrerNYeS RxXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N8Ms+wGOH+6PXxLl8QiUgrkZ/h+OaBcn8fYxiuqMxDc=; b=XJey2xuwSvqW1n71dyga0fcZmwyFX+2wHGyAM35UNWRtbbUUvN6yVG4QBDYbqtvPSk al9zUhQCwPhXHilVajVjcePzCIMW0uc9TtcC9iuCR9IqXSL/xPtSIsUNoCfdtXpj/8k3 Iz1RwDob4AdPg1Z3Mga5VE5N1MgkpZIYYsCaWq5ACrqiEdh9Cqq7DwUxcTfJZOHk8Kc1 RU7bLhImjhmehd1G3m8AGsrSsbkGbOjpKCk6GjAGbuxn26xHBPUGZFyf2dafnnY7dadq OD0LXfWQGxtfY41uKvUoYyw1CdTWfVhfVJ2h++8p9BxpBHY7QVmKUxUU7IeYIje6y/un Pkrw== X-Gm-Message-State: AIkVDXKW+vQWBjoOsUJf4ZB0seeiZgyWRG26iB3XH2MZWRRbD4jY+tflnEgrwnZ0kcThYg== X-Received: by 10.98.85.198 with SMTP id j189mr250282pfb.182.1484004633538; Mon, 09 Jan 2017 15:30:33 -0800 (PST) Received: from xeon-e3.wavecable.com (204-195-18-65.wavecable.com. [204.195.18.65]) by smtp.gmail.com with ESMTPSA id s78sm12658pfk.82.2017.01.09.15.30.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jan 2017 15:30:32 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 9 Jan 2017 15:30:19 -0800 Message-Id: <20170109233022.31154-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170109233022.31154-1-stephen@networkplumber.org> References: <20170109233022.31154-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 4/7] kni: remove useless return statements X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" A return statement at end of void function is unnecessary. Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c | 4 ---- lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_i210.c | 2 -- lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mac.c | 4 ---- lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 1 - lib/librte_eal/linuxapp/kni/ethtool/igb/igb_ethtool.c | 3 +-- lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 2 -- lib/librte_eal/linuxapp/kni/ethtool/igb/igb_vmdq.c | 11 ++--------- lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82598.c | 2 -- 8 files changed, 3 insertions(+), 26 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 d558af20..d0f77b11 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c @@ -1384,8 +1384,6 @@ void e1000_shutdown_serdes_link_82575(struct e1000_hw *hw) E1000_WRITE_FLUSH(hw); msec_delay(1); } - - return; } /** @@ -2034,8 +2032,6 @@ static void e1000_power_down_phy_copper_82575(struct e1000_hw *hw) /* If the management interface is not enabled, then power down */ if (!(e1000_enable_mng_pass_thru(hw) || phy->ops.check_reset_block(hw))) e1000_power_down_phy_copper(hw); - - return; } /** diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_i210.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_i210.c index 7e4c20a9..7b81fa65 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_i210.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_i210.c @@ -798,8 +798,6 @@ void e1000_init_function_pointers_i210(struct e1000_hw *hw) { e1000_init_function_pointers_82575(hw); hw->nvm.ops.init_params = e1000_init_nvm_params_i210; - - return; } /** diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mac.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mac.c index 74319def..4e003dea 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mac.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mac.c @@ -90,7 +90,6 @@ s32 e1000_null_ops_generic(struct e1000_hw E1000_UNUSEDARG *hw) void e1000_null_mac_generic(struct e1000_hw E1000_UNUSEDARG *hw) { DEBUGFUNC("e1000_null_mac_generic"); - return; } /** @@ -122,7 +121,6 @@ void e1000_null_update_mc(struct e1000_hw E1000_UNUSEDARG *hw, u8 E1000_UNUSEDARG *h, u32 E1000_UNUSEDARG a) { DEBUGFUNC("e1000_null_update_mc"); - return; } /** @@ -133,7 +131,6 @@ void e1000_null_write_vfta(struct e1000_hw E1000_UNUSEDARG *hw, u32 E1000_UNUSEDARG a, u32 E1000_UNUSEDARG b) { DEBUGFUNC("e1000_null_write_vfta"); - return; } /** @@ -144,7 +141,6 @@ void e1000_null_rar_set(struct e1000_hw E1000_UNUSEDARG *hw, u8 E1000_UNUSEDARG *h, u32 E1000_UNUSEDARG a) { DEBUGFUNC("e1000_null_rar_set"); - return; } /** diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c index d8a77c45..185c14e9 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c @@ -115,7 +115,6 @@ s32 e1000_null_read_reg(struct e1000_hw E1000_UNUSEDARG *hw, void e1000_null_phy_generic(struct e1000_hw E1000_UNUSEDARG *hw) { DEBUGFUNC("e1000_null_phy_generic"); - return; } /** diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_ethtool.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_ethtool.c index d7a987d5..8a79f386 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_ethtool.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_ethtool.c @@ -2415,9 +2415,8 @@ static void igb_get_dmac(struct net_device *netdev, struct ethtool_value *edata) { struct igb_adapter *adapter = netdev_priv(netdev); - edata->data = adapter->dmac; - return; + edata->data = adapter->dmac; } #endif 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 f4dca5a3..1f77db2c 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c @@ -2492,8 +2492,6 @@ static void igb_set_fw_version(struct igb_adapter *adapter) } break; } - - return; } /** diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_vmdq.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_vmdq.c index 205da562..f48aebb0 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_vmdq.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_vmdq.c @@ -197,8 +197,6 @@ void igb_vmdq_set_rx_mode(struct net_device *dev) #endif } E1000_WRITE_REG(hw, E1000_VMOLR(hw_queue), vmolr); - - return; } int igb_vmdq_set_mac(struct net_device *dev, void *p) @@ -247,9 +245,8 @@ void igb_vmdq_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) igb_enable_vlan_tags(adapter); E1000_WRITE_REG(hw, E1000_VMVIR(hw_queue), 0); - - return; } + void igb_vmdq_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) { struct igb_vmdq_adapter *vadapter = netdev_priv(dev); @@ -272,9 +269,8 @@ void igb_vmdq_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) v_netdev->features |= adapter->netdev->features; vlan_group_set_device(vadapter->vlgrp, vid, v_netdev); #endif - - return; } + void igb_vmdq_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) { struct igb_vmdq_adapter *vadapter = netdev_priv(dev); @@ -285,9 +281,6 @@ void igb_vmdq_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) vlan_group_set_device(vadapter->vlgrp, vid, NULL); /* remove vlan from VLVF table array */ igb_vlvf_set(adapter, vid, FALSE, hw_queue); - - - return; } static int igb_vmdq_get_settings(struct net_device *netdev, diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82598.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82598.c index e17b7f18..33a9213f 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82598.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82598.c @@ -1291,6 +1291,4 @@ static void ixgbe_set_rxpba_82598(struct ixgbe_hw *hw, int num_pb, /* Setup Tx packet buffer sizes */ for (i = 0; i < IXGBE_MAX_PACKET_BUFFERS; i++) IXGBE_WRITE_REG(hw, IXGBE_TXPBSIZE(i), IXGBE_TXPBSIZE_40KB); - - return; }