diff options
| author | Jan Glauber <jang@linux.vnet.ibm.com> | 2012-12-05 18:20:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-07 12:56:22 -0500 |
| commit | fd3065b25b69ce345073bbd294a73343a608fd8b (patch) | |
| tree | ae42adeddf60d1432bc75a5f466684896242ee9d | |
| parent | c63da990cd63153ce5203f96822638a7ef0f9bf7 (diff) | |
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>
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/sge.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c index 9a0a85898a50..5328804779f4 100644 --- a/drivers/net/ethernet/chelsio/cxgb/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb/sge.c | |||
| @@ -367,18 +367,6 @@ void t1_sched_set_drain_bits_per_us(struct sge *sge, unsigned int port, | |||
| 367 | 367 | ||
| 368 | #endif /* 0 */ | 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 | * tx_sched_init() allocates resources and does basic initialization. | 371 | * tx_sched_init() allocates resources and does basic initialization. |
| 384 | */ | 372 | */ |
| @@ -411,7 +399,7 @@ static int tx_sched_init(struct sge *sge) | |||
| 411 | static inline int sched_update_avail(struct sge *sge) | 399 | static inline int sched_update_avail(struct sge *sge) |
| 412 | { | 400 | { |
| 413 | struct sched *s = sge->tx_sched; | 401 | struct sched *s = sge->tx_sched; |
| 414 | ktime_t now = get_clock(); | 402 | ktime_t now = ktime_get(); |
| 415 | unsigned int i; | 403 | unsigned int i; |
| 416 | long long delta_time_ns; | 404 | long long delta_time_ns; |
| 417 | 405 | ||
