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

Commit f3e7841c authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: change configure_pcs_link to void since it always returns 0 



Since igb_configure_pcs_link always returns 0 there isn't really much point
to checking for the result so it is best just to change this to a void so
we can properly ignore the return result.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 099e1cb7

drivers/net/igb/e1000_82575.c

+4 −9
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static s32 igb_setup_fiber_serdes_link_82575(struct e1000_hw *); 
static s32  igb_write_phy_reg_sgmii_82575(struct e1000_hw *, u32, u16);

static void igb_clear_hw_cntrs_82575(struct e1000_hw *);

static s32  igb_acquire_swfw_sync_82575(struct e1000_hw *, u16);

static s32  igb_configure_pcs_link_82575(struct e1000_hw *);

static void igb_configure_pcs_link_82575(struct e1000_hw *);

static s32  igb_get_pcs_speed_and_duplex_82575(struct e1000_hw *, u16 *,

						 u16 *);

static s32  igb_get_phy_id_82575(struct e1000_hw *);
@@ -1050,9 +1050,7 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) 
		}

	}



	ret_val = igb_configure_pcs_link_82575(hw);

	if (ret_val)

		goto out;

	igb_configure_pcs_link_82575(hw);



	/*

	 * Check link status. Wait up to 100 microseconds for link to become
@@ -1161,14 +1159,14 @@ static s32 igb_setup_fiber_serdes_link_82575(struct e1000_hw *hw) 
 *  independent interface (sgmii) is being used.  Configures the link

 *  for auto-negotiation or forces speed/duplex.

 **/

static s32 igb_configure_pcs_link_82575(struct e1000_hw *hw)

static void igb_configure_pcs_link_82575(struct e1000_hw *hw)

{

	struct e1000_mac_info *mac = &hw->mac;

	u32 reg = 0;



	if (hw->phy.media_type != e1000_media_type_copper ||

	    !(igb_sgmii_active_82575(hw)))

		goto out;

		return;



	/* For SGMII, we need to issue a PCS autoneg restart */

	reg = rd32(E1000_PCS_LCTL);
@@ -1211,9 +1209,6 @@ static s32 igb_configure_pcs_link_82575(struct e1000_hw *hw) 
		       reg);

	}

	wr32(E1000_PCS_LCTL, reg);



out:

	return 0;

}



/**