Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe1e980f authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: remove unnecessary returns from void functions 



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

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 4bcf053b

drivers/net/ethernet/intel/e1000e/ich8lan.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

}



/**

drivers/net/ethernet/intel/e1000e/mac.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −5
Original line number Diff line number Diff line
@@ -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 @@ static void e1000e_dump(struct e1000_adapter *adapter) 


	/* 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 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
			}

		}

	}



exit:

	return;

}



/**