Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jan Glauber and committed by
David S. Miller
fd3065b2 c63da990

+1 -13
+1 -13
drivers/net/ethernet/chelsio/cxgb/sge.c
··· 367 367 368 368 #endif /* 0 */ 369 369 370 - 371 - /* 372 - * get_clock() implements a ns clock (see ktime_get) 373 - */ 374 - static inline ktime_t get_clock(void) 375 - { 376 - struct timespec ts; 377 - 378 - ktime_get_ts(&ts); 379 - return timespec_to_ktime(ts); 380 - } 381 - 382 370 /* 383 371 * tx_sched_init() allocates resources and does basic initialization. 384 372 */ ··· 399 411 static inline int sched_update_avail(struct sge *sge) 400 412 { 401 413 struct sched *s = sge->tx_sched; 402 - ktime_t now = get_clock(); 414 + ktime_t now = ktime_get(); 403 415 unsigned int i; 404 416 long long delta_time_ns; 405 417