From: tip-bot for Thomas Gleixner <tipbot@zytor.com> To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, john.stultz@linaro.org, hpa@zytor.com, mingo@kernel.org, stefanr@s5r6.in-berlin.de, peterz@infradead.org, tglx@linutronix.de Subject: [tip:timers/core] firewire: Use ktime_get_ts() Date: Sat, 21 Jun 2014 13:37:25 -0700 [thread overview] Message-ID: <tip-889235ce2b26cdd231c7a1d6005928ec42f11637@git.kernel.org> (raw) In-Reply-To: <20140611234607.351283464@linutronix.de> Commit-ID: 889235ce2b26cdd231c7a1d6005928ec42f11637 Gitweb: http://git.kernel.org/tip/889235ce2b26cdd231c7a1d6005928ec42f11637 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Wed, 11 Jun 2014 23:59:16 +0000 Committer: Thomas Gleixner <tglx@linutronix.de> 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 <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Peter Zijlstra <peterz@infradead.org> Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Link: http://lkml.kernel.org/r/20140611234607.351283464@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- 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; }
next prev parent reply other threads:[~2014-06-21 20:38 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-06-11 23:59 [patch 00/13] time: Tree wide cleanup of interfaces and crap Thomas Gleixner 2014-06-11 23:59 ` [patch 01/13] acct: Use ktime_get_ts() Thomas Gleixner 2014-06-21 20:36 ` [tip:timers/core] " tip-bot for Thomas Gleixner 2014-06-11 23:59 ` [patch 02/13] tsacct: " Thomas Gleixner 2014-06-21 20:37 ` [tip:timers/core] " tip-bot for Thomas Gleixner 2014-06-11 23:59 ` [patch 03/13] delayacct: " Thomas Gleixner 2014-06-21 20:36 ` [tip:timers/core] " tip-bot for Thomas Gleixner 2014-06-11 23:59 ` [patch 05/13] sound: " Thomas Gleixner 2014-06-12 10:42 ` Takashi Iwai 2014-06-12 10:51 ` Thomas Gleixner 2014-06-12 10:59 ` Takashi Iwai 2014-06-11 23:59 ` [patch 04/13] net: mac80211: " Thomas Gleixner 2014-06-11 23:59 ` Thomas Gleixner 2014-06-12 6:53 ` Johannes Berg 2014-06-12 9:03 ` Luis R. Rodriguez 2014-06-12 9:03 ` [Cocci] " Luis R. Rodriguez 2014-06-12 9:51 ` Julia.Lawall 2014-06-12 9:51 ` Julia.Lawall at lip6.fr 2014-06-12 10:49 ` Thomas Gleixner 2014-06-12 10:49 ` Thomas Gleixner 2014-06-11 23:59 ` [patch 06/13] sound: intel8x0: Use ktime and ktime_get() Thomas Gleixner 2014-06-11 23:59 ` [patch 08/13] firewire: Use ktime_get_ts() Thomas Gleixner 2014-06-12 12:35 ` Stefan Richter 2014-06-12 14:12 ` Thomas Gleixner 2014-06-21 20:37 ` tip-bot for Thomas Gleixner [this message] 2014-06-11 23:59 ` [patch 07/13] kdb: " Thomas Gleixner 2014-06-21 20:37 ` [tip:timers/core] " tip-bot for Thomas Gleixner 2014-06-11 23:59 ` [patch 10/13] time: Remove do_posix_clock_monotonic_gettime() Thomas Gleixner 2014-06-11 23:59 ` [patch 09/13] fork: Use ktime_get_ts() Thomas Gleixner 2014-06-21 20:37 ` [tip:timers/core] " tip-bot for Thomas Gleixner 2014-06-11 23:59 ` [patch 11/13] wireless: mwifiex: Use the proper interfaces Thomas Gleixner 2014-06-11 23:59 ` Thomas Gleixner 2014-06-12 3:22 ` Bing Zhao 2014-06-12 8:31 ` [patch V2] " Thomas Gleixner 2014-06-12 8:38 ` Johannes Berg 2014-06-13 18:28 ` Bing Zhao 2014-06-13 18:28 ` Bing Zhao 2014-06-11 23:59 ` [patch 12/13] net: mac80211: Remove silly timespec dance Thomas Gleixner 2014-06-11 23:59 ` Thomas Gleixner 2014-06-12 6:49 ` Johannes Berg 2014-06-12 8:19 ` Thomas Gleixner 2014-06-12 8:35 ` net_timedelta() affected by settimeofday() (was: [patch 12/13] net: mac80211: Remove silly timespec dance) Johannes Berg 2014-06-12 8:39 ` Johannes Berg 2014-06-12 8:57 ` Thomas Gleixner 2014-06-12 9:21 ` Johannes Berg 2014-06-12 14:09 ` Thomas Gleixner 2014-06-12 14:09 ` Thomas Gleixner 2014-06-13 17:58 ` Johannes Berg 2014-06-11 23:59 ` [patch 13/13] tomoyo: Use sensible time interface Thomas Gleixner 2014-06-12 0:08 ` John Stultz 2014-06-12 0:22 ` Thomas Gleixner 2014-06-12 0:28 ` John Stultz 2014-06-12 0:36 ` Thomas Gleixner 2014-06-12 11:53 ` Tetsuo Handa 2014-06-21 20:37 ` [tip:timers/core] " tip-bot for Thomas Gleixner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tip-889235ce2b26cdd231c7a1d6005928ec42f11637@git.kernel.org \ --to=tipbot@zytor.com \ --cc=hpa@zytor.com \ --cc=john.stultz@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@vger.kernel.org \ --cc=mingo@kernel.org \ --cc=peterz@infradead.org \ --cc=stefanr@s5r6.in-berlin.de \ --cc=tglx@linutronix.de \ --subject='Re: [tip:timers/core] firewire: Use ktime_get_ts()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.