e1000e: remove unnecessary returns from void functions

...and convert some goto's which simply return to just return.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 5061d4ded6e2283404a6a7700785cd11db3a913a..942f4da86fb8c9ca451a10e05a1bc2d91b4b8d9e 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1762,7 +1762,6 @@ static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate)
                extcnf_ctrl &= ~E1000_EXTCNF_CTRL_GATE_PHY_CFG;
 
        ew32(EXTCNF_CTRL, extcnf_ctrl);
-       return;
 }
 
 /**
@@ -3768,8 +3767,6 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
 
 release:
        hw->phy.ops.release(hw);
-
-       return;
 }
 
 /**

diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 33d1b9e3c8d86b51e56d6379f015d013c33b45ed..be8335aead5ec06ce15b18082fea0f08d667b404 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -1661,7 +1661,7 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)
 
        if (!mac->adaptive_ifs) {
                e_dbg("Not in Adaptive IFS mode!\n");
-               goto out;
+               return;
        }
 
        mac->current_ifs_val = 0;
@@ -1672,8 +1672,6 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)
 
        mac->in_ifs_mode = false;
        ew32(AIT, 0);
-out:
-       return;
 }
 
 /**
@@ -1689,7 +1687,7 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
 
        if (!mac->adaptive_ifs) {
                e_dbg("Not in Adaptive IFS mode!\n");
-               goto out;
+               return;
        }
 
        if ((mac->collision_delta * mac->ifs_ratio) > mac->tx_packet_delta) {
@@ -1712,6 +1710,4 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
                        ew32(AIT, 0);
                }
        }
-out:
-       return;
 }

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 293a7606e0f4b83a192bd64e7f2c2cb538082d58..7ccd5f3cef61971c7a5493af5b9f0b2cd9c6829c 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -221,7 +221,7 @@ static void e1000e_dump(struct e1000_adapter *adapter)
 
        /* Print Tx Ring Summary */
        if (!netdev || !netif_running(netdev))
-               goto exit;
+               return;
 
        dev_info(&adapter->pdev->dev, "Tx Ring Summary\n");
        pr_info("Queue [NTU] [NTC] [bi(ntc)->dma  ] leng ntw timestamp\n");
@@ -308,7 +308,7 @@ rx_ring_summary:
 
        /* Print Rx Ring */
        if (!netif_msg_rx_status(adapter))
-               goto exit;
+               return;
 
        dev_info(&adapter->pdev->dev, "Rx Ring Dump\n");
        switch (adapter->rx_ps_pages) {
@@ -449,9 +449,6 @@ rx_ring_summary:
                        }
                }
        }
-
-exit:
-       return;
 }
 
 /**