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

Commit 6425f0f3 authored by Jean Sacren's avatar Jean Sacren Committed by Jeff Kirsher
Browse files

ixgbe: fix ixgbe_check_reset_blocked() declaration 



The commit c97506ab ("ixgbe: Add check for FW veto bit")
introduced the new function ixgbe_check_reset_blocked() with a minor
issue in declaration. Fix the declaration by changing the type
specifier to bool as the definition returns a boolean value.
Additionally all ixgbe_check_reset_blocked() callers are expected to
return a boolean value.

Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
Acked-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 151b260c

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw) 
 * have this bit just return false since the link can not be blocked

 * via this method.

 **/

s32 ixgbe_check_reset_blocked(struct ixgbe_hw *hw)

bool ixgbe_check_reset_blocked(struct ixgbe_hw *hw)

{

	u32 mmngc;

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw, 
s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,

                                               ixgbe_link_speed *speed,

                                               bool *autoneg);

s32 ixgbe_check_reset_blocked(struct ixgbe_hw *hw);

bool ixgbe_check_reset_blocked(struct ixgbe_hw *hw);



/* PHY specific */

s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw,