summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-02-03 03:45:11 -0500
committerDavid S. Miller <davem@davemloft.net>2015-02-04 13:58:29 -0800
commitb5057dd79c2db9a2be5306fdcdb2eae5c9c0e109 (patch)
tree291f7c6070bd1ae7f64b78538911ce51785f1df3 /drivers/net
parent51fd9471492adecaebae199a6b18ff929062620a (diff)
downloadlinux-b5057dd79c2db9a2be5306fdcdb2eae5c9c0e109.tar.gz
linux-b5057dd79c2db9a2be5306fdcdb2eae5c9c0e109.tar.bz2
linux-b5057dd79c2db9a2be5306fdcdb2eae5c9c0e109.zip
tlan: msecs_to_jiffies convrsion
This is only an API consolidation and should make things more readable it replaces var * HZ / 1000 by msecs_to_jiffies(var). As there is a discrepancy between the code and the comments this is in a separate patch. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/ti/tlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 1f722c99afb9..691ec936e88d 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -2561,7 +2561,7 @@ static void tlan_phy_power_up(struct net_device *dev)
* transceiver. The TLAN docs say both 50 ms and
* 500 ms, so do the longer, just in case.
*/
- tlan_set_timer(dev, (HZ/20), TLAN_TIMER_PHY_RESET);
+ tlan_set_timer(dev, msecs_to_jiffies(500), TLAN_TIMER_PHY_RESET);
}