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

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

e1000e: cleanup use of check_mng_mode function pointer 



Replace e1000_check_mng_mode() inline function with calls to the MAC ops
check_mng_mode function pointer.

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 1a46b40f

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

+1 −1
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw) 
	 * firmware will have already initialized them.  We only initialize

	 * them if the HW is not in IAMT mode.

	 */

	if (!e1000e_check_mng_mode(hw)) {

	if (!hw->mac.ops.check_mng_mode(hw)) {

		/* Enable Electrical Idle on the PHY */

		data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE;

		ret_val = e1e_wphy(hw, GG82563_PHY_PWR_MGMT_CTRL, data);

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

+0 −5
Original line number Diff line number Diff line
@@ -725,11 +725,6 @@ static inline s32 e1000_get_phy_info(struct e1000_hw *hw) 
	return hw->phy.ops.get_info(hw);

}



static inline s32 e1000e_check_mng_mode(struct e1000_hw *hw)

{

	return hw->mac.ops.check_mng_mode(hw);

}



extern bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);

extern bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);

extern s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);

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

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



/**

 *  e1000e_check_mng_mode_generic - check management mode

 *  e1000e_check_mng_mode_generic - Generic check management mode

 *  @hw: pointer to the HW structure

 *

 *  Reads the firmware semaphore register and returns true (>0) if
@@ -138,7 +138,7 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw) 
	hw->mac.tx_pkt_filtering = true;



	/* No manageability, no filtering */

	if (!e1000e_check_mng_mode(hw)) {

	if (!hw->mac.ops.check_mng_mode(hw)) {

		hw->mac.tx_pkt_filtering = false;

		return hw->mac.tx_pkt_filtering;

	}