Merge tag 'firewire-update2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Mar 2016 15:52:25 +0000 (08:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Mar 2016 15:52:25 +0000 (08:52 -0700)
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

drivers/firewire/nosy.c

index 8a46077129ac640cd1b7d3d51ae13668f2d8a90c..631c977b0da5f817b7ecf950d94f90198a53abbe 100644 (file)
@@ -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, &timestamp, 4);
 
        spin_unlock(&lynx->client_list_lock);
 }