projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a9821c7
)
firewire: Use ktime_get_ts()
author
Thomas Gleixner
<
[email protected]
>
Wed, 11 Jun 2014 23:59:16 +0000
(23:59 +0000)
committer
Thomas Gleixner
<
[email protected]
>
Thu, 12 Jun 2014 14:18:45 +0000
(16:18 +0200)
do_posix_clock_monotonic_gettime() is a leftover from the initial
posix timer implementation which maps to ktime_get_ts()
Signed-off-by: Thomas Gleixner <
[email protected]
>
Cc: John Stultz <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Acked-by: Stefan Richter <
[email protected]
>
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Thomas Gleixner <
[email protected]
>
drivers/firewire/core-cdev.c
patch
|
blob
|
history
diff --git
a/drivers/firewire/core-cdev.c
b/drivers/firewire/core-cdev.c
index d7d5c8af92b9754fa79aa632c69d9ffc1fb27420..5d997a33907e431b895111fc27039468be244614 100644
(file)
--- a/
drivers/firewire/core-cdev.c
+++ b/
drivers/firewire/core-cdev.c
@@
-1214,9
+1214,9
@@
static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg)
cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME);
switch (a->clk_id) {
- case CLOCK_REALTIME: getnstimeofday(&ts);
break;
- case CLOCK_MONOTONIC:
do_posix_clock_monotonic_gettime(&ts);
break;
- case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts);
break;
+ case CLOCK_REALTIME: getnstimeofday(&ts); break;
+ case CLOCK_MONOTONIC:
ktime_get_ts(&ts);
break;
+ case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break;
default:
ret = -EINVAL;
}