]> www.infradead.org Git - users/jedix/linux-maple.git/commit
e1000e: use msleep instead of mdelay
authorJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 07:56:02 +0000 (15:56 +0800)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 07:56:02 +0000 (15:56 +0800)
commitc3468f7525b63543a729a8c520443b4f598a8587
treee4e29ece6d44633801b856164809e419c7190062
parentd0bd4a3d84e6cde2a6d4dbb95531893afe4c8058
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>.

(backported from commit bb9c5ee15b560f944a8877f60e7d3d77ad542286)
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000e/phy.c