diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-11-07 04:01:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:56 -0500 |
commit | 8f09f4a25a927080e1fa1331735c3d1b5664866b (patch) | |
tree | 976ed857b88e3dced0bf277f50fd4c8d371fe885 /arch/ppc/8260_io | |
parent | 28faa4298ec069d1de4f54597f963be8ef35e706 (diff) |
[PATCH] ppc: fix-up schedule_timeout() usage
Use schedule_timeout_interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size. Also use
human-time conversion functions instead of hard-coded HZ division to avoid
rounding errors.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/8260_io')
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index 2086c6ad1147..4edeede9ccfd 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -1309,8 +1309,7 @@ static void mii_dm9161_wait(uint mii_reg, struct net_device *dev) | |||
1309 | 1309 | ||
1310 | /* Davicom takes a bit to come up after a reset, | 1310 | /* Davicom takes a bit to come up after a reset, |
1311 | * so wait here for a bit */ | 1311 | * so wait here for a bit */ |
1312 | set_current_state(TASK_UNINTERRUPTIBLE); | 1312 | schedule_timeout_uninterruptible(timeout); |
1313 | schedule_timeout(timeout); | ||
1314 | } | 1313 | } |
1315 | 1314 | ||
1316 | static phy_info_t phy_info_dm9161 = { | 1315 | static phy_info_t phy_info_dm9161 = { |