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

Commit 4e0d8f7d authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

e1000: convert mdelay to msleep 



With the previous commit, there are several functions
that are only ever called from thread context, and are
able to sleep with msleep instead of mdelay.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Tushar Dave <tushar.n.dave@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a4010afe

drivers/net/ethernet/intel/e1000/e1000_hw.c

+11 −11
Original line number Diff line number Diff line
@@ -5385,7 +5385,7 @@ static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw, bool link_up) 
			if (ret_val)

				return ret_val;



			mdelay(20);

			msleep(20);



			ret_val = e1000_write_phy_reg(hw, 0x0000,

						      IGP01E1000_IEEE_FORCE_GIGA);
@@ -5413,7 +5413,7 @@ static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw, bool link_up) 
			if (ret_val)

				return ret_val;



			mdelay(20);

			msleep(20);



			/* Now enable the transmitter */

			ret_val =
@@ -5440,7 +5440,7 @@ static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw, bool link_up) 
			if (ret_val)

				return ret_val;



			mdelay(20);

			msleep(20);



			ret_val = e1000_write_phy_reg(hw, 0x0000,

						      IGP01E1000_IEEE_FORCE_GIGA);
@@ -5457,7 +5457,7 @@ static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw, bool link_up) 
			if (ret_val)

				return ret_val;



			mdelay(20);

			msleep(20);



			/* Now enable the transmitter */

			ret_val =
@@ -5750,26 +5750,26 @@ static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw) 


		if ((mii_status_reg & ~MII_SR_LINK_STATUS) == 0)

			break;

		mdelay(100);

		msleep(100);

	}



	/* Recommended delay time after link has been lost */

	mdelay(1000);

	msleep(1000);



	/* Now we will re-enable th transmitter on the PHY */



	ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0019);

	if (ret_val)

		return ret_val;

	mdelay(50);

	msleep(50);

	ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFFF0);

	if (ret_val)

		return ret_val;

	mdelay(50);

	msleep(50);

	ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFF00);

	if (ret_val)

		return ret_val;

	mdelay(50);

	msleep(50);

	ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0x0000);

	if (ret_val)

		return ret_val;
@@ -5794,7 +5794,7 @@ static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw) 


		if (mii_status_reg & MII_SR_LINK_STATUS)

			break;

		mdelay(100);

		msleep(100);

	}

	return E1000_SUCCESS;

}
@@ -5825,6 +5825,6 @@ static s32 e1000_get_auto_rd_done(struct e1000_hw *hw) 
static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)

{

	e_dbg("e1000_get_phy_cfg_done");

	mdelay(10);

	msleep(10);

	return E1000_SUCCESS;

}

drivers/net/ethernet/intel/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static void e1000_power_down_phy(struct e1000_adapter *adapter) 
		e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg);

		mii_reg |= MII_CR_POWER_DOWN;

		e1000_write_phy_reg(hw, PHY_CTRL, mii_reg);

		mdelay(1);

		msleep(1);

	}

out:

	return;