summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/agere
diff options
context:
space:
mode:
authorNicholas Mc Guire2015-02-11 10:27:54 +0100
committerDavid S. Miller2015-02-12 04:37:43 +0100
commitbc2f3873f74414cdf095b337a73f96262e6aadbc (patch)
treee843ed92a363dcb78fa0e026482b531d13114ce2 /drivers/net/ethernet/agere
parentMerge branch 'rco_correctness' (diff)
downloadkernel-qcow2-linux-bc2f3873f74414cdf095b337a73f96262e6aadbc.tar.gz
kernel-qcow2-linux-bc2f3873f74414cdf095b337a73f96262e6aadbc.tar.xz
kernel-qcow2-linux-bc2f3873f74414cdf095b337a73f96262e6aadbc.zip
et131x: use msecs_to_jiffies for conversions
This is only an API consolidation and should make things more readable. Converting milliseconds to jiffies by "val * HZ / 1000" is technically OK but msecs_to_jiffies(val) is the cleaner solution and handles all corner cases correctly. This is a minor API cleanup only. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Acked-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/agere')
-rw-r--r--drivers/net/ethernet/agere/et131x.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c
index 384dc163851b..e0f3d197e7f2 100644
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c
@@ -3127,7 +3127,8 @@ static void et131x_error_timer_handler(unsigned long data)
}
/* This is a periodic timer, so reschedule */
- mod_timer(&adapter->error_timer, jiffies + TX_ERROR_PERIOD * HZ / 1000);
+ mod_timer(&adapter->error_timer, jiffies +
+ msecs_to_jiffies(TX_ERROR_PERIOD));
}
static void et131x_adapter_memory_free(struct et131x_adapter *adapter)
@@ -3647,7 +3648,8 @@ static int et131x_open(struct net_device *netdev)
/* Start the timer to track NIC errors */
init_timer(&adapter->error_timer);
- adapter->error_timer.expires = jiffies + TX_ERROR_PERIOD * HZ / 1000;
+ adapter->error_timer.expires = jiffies +
+ msecs_to_jiffies(TX_ERROR_PERIOD);
adapter->error_timer.function = et131x_error_timer_handler;
adapter->error_timer.data = (unsigned long)adapter;
add_timer(&adapter->error_timer);