diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 16:52:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 16:52:25 +0100 |
| commit | 3b3b3bd97788e1f574c71f865d8465b00a6b8708 (patch) | |
| tree | 099cef81c83c1cf095abc5a96d0166e6437e6817 /drivers/firewire | |
| parent | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | firewire: nosy: Replace timeval with timespec64 (diff) | |
| download | linux-3b3b3bd97788e1f574c71f865d8465b00a6b8708.tar.xz linux-3b3b3bd97788e1f574c71f865d8465b00a6b8708.zip | |
Merge tag 'firewire-update2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire leftover from Stefan Richter:
"Occurrences of timeval were supposed to be eliminated last round, now
remove a last forgotten one"
* tag 'firewire-update2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: nosy: Replace timeval with timespec64
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/nosy.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c index 8a46077129ac..631c977b0da5 100644 --- a/drivers/firewire/nosy.c +++ b/drivers/firewire/nosy.c @@ -446,14 +446,16 @@ static void bus_reset_irq_handler(struct pcilynx *lynx) { struct client *client; - struct timeval tv; + struct timespec64 ts64; + u32 timestamp; - do_gettimeofday(&tv); + ktime_get_real_ts64(&ts64); + timestamp = ts64.tv_nsec / NSEC_PER_USEC; spin_lock(&lynx->client_list_lock); list_for_each_entry(client, &lynx->client_list, link) - packet_buffer_put(&client->buffer, &tv.tv_usec, 4); + packet_buffer_put(&client->buffer, ×tamp, 4); spin_unlock(&lynx->client_list_lock); } |