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

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

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



Rename e1000e_id_led_init() to e1000e_id_led_init_generic() to signify the
function is used for more than one MAC-family type.  For the ich8lan MAC
family, some MACs use the generic function and others use the function
e1000_id_led_init_pchlan().  In all cases where e1000e_id_led_init() was
called directly, change to call the function pointer to be consistent with
the driver design.

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 5d74f175

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

+2 −2
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) 
	e1000_initialize_hw_bits_80003es2lan(hw);



	/* Initialize identification LED */

	ret_val = e1000e_id_led_init(hw);

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

	if (ret_val)

		e_dbg("Error initializing identification LED\n");

		/* This is not fatal and we should not stop init due to this */
@@ -1413,7 +1413,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) 


static const struct e1000_mac_operations es2_mac_ops = {

	.read_mac_addr		= e1000_read_mac_addr_80003es2lan,

	.id_led_init		= e1000e_id_led_init,

	.id_led_init		= e1000e_id_led_init_generic,

	.blink_led		= e1000e_blink_led_generic,

	.check_mng_mode		= e1000e_check_mng_mode_generic,

	/* check_for_link dependent on media type */

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

+2 −2
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) 
	e1000_initialize_hw_bits_82571(hw);



	/* Initialize identification LED */

	ret_val = e1000e_id_led_init(hw);

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

	if (ret_val)

		e_dbg("Error initializing identification LED\n");

		/* This is not fatal and we should not stop init due to this */
@@ -1911,7 +1911,7 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw) 
static const struct e1000_mac_operations e82571_mac_ops = {

	/* .check_mng_mode: mac type dependent */

	/* .check_for_link: media type dependent */

	.id_led_init		= e1000e_id_led_init,

	.id_led_init		= e1000e_id_led_init_generic,

	.cleanup_led		= e1000e_cleanup_led_generic,

	.clear_hw_cntrs		= e1000_clear_hw_cntrs_82571,

	.get_bus_info		= e1000e_get_bus_info_pcie,

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

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ extern s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u 
extern s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw, u16 *speed, u16 *duplex);

extern s32 e1000e_disable_pcie_master(struct e1000_hw *hw);

extern s32 e1000e_get_auto_rd_done(struct e1000_hw *hw);

extern s32 e1000e_id_led_init(struct e1000_hw *hw);

extern s32 e1000e_id_led_init_generic(struct e1000_hw *hw);

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);

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

+2 −3
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw) 
		/* check management mode */

		mac->ops.check_mng_mode = e1000_check_mng_mode_ich8lan;

		/* ID LED init */

		mac->ops.id_led_init = e1000e_id_led_init;

		mac->ops.id_led_init = e1000e_id_led_init_generic;

		/* blink LED */

		mac->ops.blink_led = e1000e_blink_led_generic;

		/* setup LED */
@@ -2962,7 +2962,7 @@ static s32 e1000_valid_led_default_ich8lan(struct e1000_hw *hw, u16 *data) 
 *

 *  PCH also does not have an "always on" or "always off" mode which

 *  complicates the ID feature.  Instead of using the "on" mode to indicate

 *  in ledctl_mode2 the LEDs to use for ID (see e1000e_id_led_init()),

 *  in ledctl_mode2 the LEDs to use for ID (see e1000e_id_led_init_generic()),

 *  use "link_up" mode.  The LEDs will still ID on request if there is no

 *  link based on logic in e1000_led_[on|off]_pchlan().

 **/
@@ -4006,7 +4006,6 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw) 
}



static const struct e1000_mac_operations ich8_mac_ops = {

	.id_led_init		= e1000e_id_led_init,

	/* check_mng_mode dependent on mac type */

	.check_for_link		= e1000_check_for_copper_link_ich8lan,

	/* cleanup_led dependent on mac type */

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

+2 −2
Original line number Diff line number Diff line
@@ -1399,11 +1399,11 @@ s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data) 
}



/**

 *  e1000e_id_led_init -

 *  e1000e_id_led_init_generic -

 *  @hw: pointer to the HW structure

 *

 **/

s32 e1000e_id_led_init(struct e1000_hw *hw)

s32 e1000e_id_led_init_generic(struct e1000_hw *hw)

{

	struct e1000_mac_info *mac = &hw->mac;

	s32 ret_val;