Commit fd3065b2 authored by Jan Glauber's avatar Jan Glauber Committed by David S. Miller

chelsio: remove get_clock and use ktime_get

The get_clock() of the chelsio driver clashes with the s390 one.
The chelsio helper reads a timespec via ktime just to convert it
back to ktime. I can see no different outcome from calling
ktime_get directly.

Remove the get_clock and use ktime_get directly.
Signed-off-by: default avatarJan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c63da990
...@@ -367,18 +367,6 @@ void t1_sched_set_drain_bits_per_us(struct sge *sge, unsigned int port, ...@@ -367,18 +367,6 @@ void t1_sched_set_drain_bits_per_us(struct sge *sge, unsigned int port,
#endif /* 0 */ #endif /* 0 */
/*
* get_clock() implements a ns clock (see ktime_get)
*/
static inline ktime_t get_clock(void)
{
struct timespec ts;
ktime_get_ts(&ts);
return timespec_to_ktime(ts);
}
/* /*
* tx_sched_init() allocates resources and does basic initialization. * tx_sched_init() allocates resources and does basic initialization.
*/ */
...@@ -411,7 +399,7 @@ static int tx_sched_init(struct sge *sge) ...@@ -411,7 +399,7 @@ static int tx_sched_init(struct sge *sge)
static inline int sched_update_avail(struct sge *sge) static inline int sched_update_avail(struct sge *sge)
{ {
struct sched *s = sge->tx_sched; struct sched *s = sge->tx_sched;
ktime_t now = get_clock(); ktime_t now = ktime_get();
unsigned int i; unsigned int i;
long long delta_time_ns; long long delta_time_ns;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment