OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de39b75
)
e1000e: remove redundant might_sleep()
author
Bruce Allan
<bruce.w.allan@intel.com>
Fri, 20 Nov 2009 23:28:17 +0000
(23:28 +0000)
committer
David 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
patch
|
blob
|
history
diff --git
a/drivers/net/e1000e/ich8lan.c
b/drivers/net/e1000e/ich8lan.c
index
fe6dc3d
..
f991b14
100644
(file)
--- a/
drivers/net/e1000e/ich8lan.c
+++ b/
drivers/net/e1000e/ich8lan.c
@@
-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) {