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

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

e1000e: use msleep instead of mdelay 



The e1000_link_stall_workaround_lv() function is always called in non-
atomic context so it should use msleep instead of mdelay.  Also, remove
unnecessary #include <linux/delay.h>.

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 3d3a1676

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

+1 −3
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 


*******************************************************************************/



#include <linux/delay.h>



#include "e1000.h"



static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
@@ -3153,7 +3151,7 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw) 
		     BM_CS_STATUS_SPEED_1000))

		return 0;



	mdelay(200);

	msleep(200);



	/* flush the packets in the fifo buffer */

	ret_val = e1e_wphy(hw, HV_MUX_DATA_CTRL, HV_MUX_DATA_CTRL_GEN_TO_MAC |