e1000e: remove redundant might_sleep()
authorBruce Allan <bruce.w.allan@intel.com>
Fri, 20 Nov 2009 23:28:17 +0000 (23:28 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Nov 2009 19:34:28 +0000 (11:34 -0800)
Now that mutex_lock() calls might_sleep() the driver doesn't have to here.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e1000e/ich8lan.c

index fe6dc3de9ac7d2b268515e3b2aa5fe860949eb42..f991b14a98d3283909f6dd565aa95fc5be46609b 100644 (file)
@@ -630,8 +630,6 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
        u32 extcnf_ctrl, timeout = PHY_CFG_TIMEOUT;
        s32 ret_val = 0;
 
-       might_sleep();
-
        mutex_lock(&swflag_mutex);
 
        while (timeout) {