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

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

e1000e: cleanup: rename e1000e_setup_link() and call as function pointer 



Rename e1000e_setup_link() to e1000e_setup_link_generic() to signify the
function is used for more than one MAC-family type.  The 82571-family has
a custom setup_link function which also calls the generic function.  The
ich8lan-family has a custom function which should just be called via the
function pointer.  The 80003es2lan-family just uses the generic function.

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 d1964eb1

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+2 −2
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) 
		E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);



	/* Setup link and flow control */

	ret_val = e1000e_setup_link(hw);

	ret_val = mac->ops.setup_link(hw);



	/* Disable IBIST slave mode (far-end loopback) */

	e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
@@ -1429,7 +1429,7 @@ static const struct e1000_mac_operations es2_mac_ops = { 
	.clear_vfta		= e1000_clear_vfta_generic,

	.reset_hw		= e1000_reset_hw_80003es2lan,

	.init_hw		= e1000_init_hw_80003es2lan,

	.setup_link		= e1000e_setup_link,

	.setup_link		= e1000e_setup_link_generic,

	/* setup_physical_interface dependent on media type */

	.setup_led		= e1000e_setup_led_generic,

};

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

+2 −2
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) 
		E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);



	/* Setup link and flow control */

	ret_val = e1000_setup_link_82571(hw);

	ret_val = mac->ops.setup_link(hw);



	/* Set the transmit descriptor write-back policy */

	reg_data = er32(TXDCTL(0));
@@ -1455,7 +1455,7 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw) 
		break;

	}



	return e1000e_setup_link(hw);

	return e1000e_setup_link_generic(hw);

}



/**

drivers/net/ethernet/intel/e1000e/e1000.h

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ extern void e1000e_clear_hw_cntrs_base(struct e1000_hw *hw); 
extern s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw);

extern s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw);

extern s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw);

extern s32 e1000e_setup_link(struct e1000_hw *hw);

extern s32 e1000e_setup_link_generic(struct e1000_hw *hw);

extern void e1000_clear_vfta_generic(struct e1000_hw *hw);

extern void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);

extern void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,

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

+1 −1
Original line number Diff line number Diff line
@@ -3212,7 +3212,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw) 
	}



	/* Setup link and flow control */

	ret_val = e1000_setup_link_ich8lan(hw);

	ret_val = mac->ops.setup_link(hw);



	/* Set the transmit descriptor write-back policy for both queues */

	txdctl = er32(TXDCTL(0));

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

+2 −2
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw) 
}



/**

 *  e1000e_setup_link - Setup flow control and link settings

 *  e1000e_setup_link_generic - Setup flow control and link settings

 *  @hw: pointer to the HW structure

 *

 *  Determines which flow control settings to use, then configures flow
@@ -702,7 +702,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw) 
 *  should be established.  Assumes the hardware has previously been reset

 *  and the transmitter and receiver are not enabled.

 **/

s32 e1000e_setup_link(struct e1000_hw *hw)

s32 e1000e_setup_link_generic(struct e1000_hw *hw)

{

	struct e1000_mac_info *mac = &hw->mac;

	s32 ret_val;