2014-06-12 00:01:33

by Thomas Gleixner

Subject: [patch 08/13] firewire: Use ktime_get_ts()

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: Stefan Richter <[email protected]>
---
drivers/firewire/core-cdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux/drivers/firewire/core-cdev.c
===================================================================
--- linux.orig/drivers/firewire/core-cdev.c
+++ linux/drivers/firewire/core-cdev.c
@@ -1215,7 +1215,7 @@ static int ioctl_get_cycle_timer2(struct

switch (a->clk_id) {
case CLOCK_REALTIME: getnstimeofday(&ts); break;
- case CLOCK_MONOTONIC: do_posix_clock_monotonic_gettime(&ts); break;
+ case CLOCK_MONOTONIC: ktime_get_ts(&ts); break;
case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break;
default:
ret = -EINVAL;

2014-06-12 12:37:28

by Stefan Richter

Subject: Re: [patch 08/13] firewire: Use ktime_get_ts()

On Jun 11 Thomas Gleixner wrote:
> 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: Stefan Richter <[email protected]>

Acked-by: Stefan Richter <[email protected]>

(Though I am noticing increasing entropy WRT whitespace.)

> ---
> drivers/firewire/core-cdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux/drivers/firewire/core-cdev.c
> ===================================================================
> --- linux.orig/drivers/firewire/core-cdev.c
> +++ linux/drivers/firewire/core-cdev.c
> @@ -1215,7 +1215,7 @@ static int ioctl_get_cycle_timer2(struct
>
> switch (a->clk_id) {
> case CLOCK_REALTIME: getnstimeofday(&ts); break;
> - case CLOCK_MONOTONIC: do_posix_clock_monotonic_gettime(&ts); break;
> + case CLOCK_MONOTONIC: ktime_get_ts(&ts); break;
> case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break;
> default:
> ret = -EINVAL;
>
>

--
Stefan Richter
-=====-====- -==- -==--
http://arcgraph.de/sr/

2014-06-12 14:12:11

by Thomas Gleixner

Subject: Re: [patch 08/13] firewire: Use ktime_get_ts()

On Thu, 12 Jun 2014, Stefan Richter wrote:

> On Jun 11 Thomas Gleixner wrote:
> > 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: Stefan Richter <[email protected]>
>
> Acked-by: Stefan Richter <[email protected]>
>
> (Though I am noticing increasing entropy WRT whitespace.)

Fixed it up.

2014-06-21 20:38:12

by tip-bot for Vasyl Gomonovych

Subject: [tip:timers/core] firewire: Use ktime_get_ts()

Commit-ID: 889235ce2b26cdd231c7a1d6005928ec42f11637
Gitweb: http://git.kernel.org/tip/889235ce2b26cdd231c7a1d6005928ec42f11637
Author: Thomas Gleixner <[email protected]>
AuthorDate: Wed, 11 Jun 2014 23:59:16 +0000
Committer: Thomas Gleixner <[email protected]>
CommitDate: Thu, 12 Jun 2014 16:18:45 +0200

firewire: Use ktime_get_ts()

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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index d7d5c8a..5d997a3 100644
--- 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;
}