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

Commit 99b76642 authored Dec 15, 2012 by Josh Hay Committed by Jeff Kirsher Jan 31, 2013

ixgbe: removed unused variable from setup_link_speed



Removes the autoneg parameter from the setup_link_speed functions.  These
functions do nothing with this parameter.

Signed-off-by: Josh Hay <joshua.a.hay@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 3d292265

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -698,7 +698,7 @@ static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw,
	s32 status;		s32 status;

	/* Setup the PHY according to input speed */		/* Setup the PHY according to input speed */
	status = hw->phy.ops.setup_link_speed(hw, speed, autoneg,		status = hw->phy.ops.setup_link_speed(hw, speed,
	autoneg_wait_to_complete);		autoneg_wait_to_complete);
	/* Set up MAC */		/* Set up MAC */
	ixgbe_start_mac_link_82598(hw, autoneg_wait_to_complete);		ixgbe_start_mac_link_82598(hw, autoneg_wait_to_complete);

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -923,7 +923,7 @@ static s32 ixgbe_setup_copper_link_82599(struct ixgbe_hw *hw,
	s32 status;		s32 status;

	/* Setup the PHY according to input speed */		/* Setup the PHY according to input speed */
	status = hw->phy.ops.setup_link_speed(hw, speed, autoneg,		status = hw->phy.ops.setup_link_speed(hw, speed,
	autoneg_wait_to_complete);		autoneg_wait_to_complete);
	/* Set up MAC */		/* Set up MAC */
	ixgbe_start_mac_link_82599(hw, autoneg_wait_to_complete);		ixgbe_start_mac_link_82599(hw, autoneg_wait_to_complete);

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -494,11 +494,9 @@ s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)
	* ixgbe_setup_phy_link_speed_generic - Sets the auto advertised capabilities		* ixgbe_setup_phy_link_speed_generic - Sets the auto advertised capabilities
	* @hw: pointer to hardware structure		* @hw: pointer to hardware structure
	* @speed: new link speed		* @speed: new link speed
	* @autoneg: true if autonegotiation enabled
	**/		**/
	s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,		s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
	ixgbe_link_speed speed,		ixgbe_link_speed speed,
	bool autoneg,
	bool autoneg_wait_to_complete)		bool autoneg_wait_to_complete)
	{		{

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -98,7 +98,6 @@ s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
	s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw);		s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw);
	s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,		s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
	ixgbe_link_speed speed,		ixgbe_link_speed speed,
	bool autoneg,
	bool autoneg_wait_to_complete);		bool autoneg_wait_to_complete);
	s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,		s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
	ixgbe_link_speed *speed,		ixgbe_link_speed *speed,

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2869,8 +2869,7 @@ struct ixgbe_phy_operations {
	s32 (read_reg)(struct ixgbe_hw , u32, u32, u16 *);		s32 (read_reg)(struct ixgbe_hw , u32, u32, u16 *);
	s32 (write_reg)(struct ixgbe_hw , u32, u32, u16);		s32 (write_reg)(struct ixgbe_hw , u32, u32, u16);
	s32 (setup_link)(struct ixgbe_hw );		s32 (setup_link)(struct ixgbe_hw );
	s32 (setup_link_speed)(struct ixgbe_hw , ixgbe_link_speed, bool,		s32 (setup_link_speed)(struct ixgbe_hw , ixgbe_link_speed, bool);
	bool);
	s32 (check_link)(struct ixgbe_hw , ixgbe_link_speed , bool );		s32 (check_link)(struct ixgbe_hw , ixgbe_link_speed , bool );
	s32 (get_firmware_version)(struct ixgbe_hw , u16 *);		s32 (get_firmware_version)(struct ixgbe_hw , u16 *);
	s32 (read_i2c_byte)(struct ixgbe_hw , u8, u8, u8 *);		s32 (read_i2c_byte)(struct ixgbe_hw , u8, u8, u8 *);