1 files changed, 13 insertions, 13 deletions

diff --git a/fs/timerfd.c b/fs/timerfd.c
index 9ae4abb4110b..fb4407a7cf9e 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -55,7 +55,7 @@ static inline bool isalarm(struct timerfd_ctx *ctx)
 /*
  * This gets called when the timer event triggers. We set the "expired"
  * flag, but we do not re-arm the timer (in case it's necessary,
- * tintv.tv64 != 0) until the timer is accessed.
+ * tintv != 0) until the timer is accessed.
  */
 static void timerfd_triggered(struct timerfd_ctx *ctx)
 {
@@ -93,7 +93,7 @@ static enum alarmtimer_restart timerfd_alarmproc(struct alarm *alarm,
  */
 void timerfd_clock_was_set(void)
 {
-        ktime_t moffs = ktime_mono_to_real((ktime_t){ .tv64 = 0 });
+        ktime_t moffs = ktime_mono_to_real(0);
         struct timerfd_ctx *ctx;
         unsigned long flags;
 
@@ -102,8 +102,8 @@ void timerfd_clock_was_set(void)
                 if (!ctx->might_cancel)
                         continue;
                 spin_lock_irqsave(&ctx->wqh.lock, flags);
-                if (ctx->moffs.tv64 != moffs.tv64) {
-                        ctx->moffs.tv64 = KTIME_MAX;
+                if (ctx->moffs != moffs) {
+                        ctx->moffs = KTIME_MAX;
                         ctx->ticks++;
                         wake_up_locked(&ctx->wqh);
                 }
@@ -124,9 +124,9 @@ static void timerfd_remove_cancel(struct timerfd_ctx *ctx)
 
 static bool timerfd_canceled(struct timerfd_ctx *ctx)
 {
-        if (!ctx->might_cancel || ctx->moffs.tv64 != KTIME_MAX)
+        if (!ctx->might_cancel || ctx->moffs != KTIME_MAX)
                 return false;
-        ctx->moffs = ktime_mono_to_real((ktime_t){ .tv64 = 0 });
+        ctx->moffs = ktime_mono_to_real(0);
         return true;
 }
 
@@ -155,7 +155,7 @@ static ktime_t timerfd_get_remaining(struct timerfd_ctx *ctx)
         else
                 remaining = hrtimer_expires_remaining_adjusted(&ctx->t.tmr);
 
-        return remaining.tv64 < 0 ? ktime_set(0, 0): remaining;
+        return remaining < 0 ? ktime_set(0, 0): remaining;
 }
 
 static int timerfd_setup(struct timerfd_ctx *ctx, int flags,
@@ -184,7 +184,7 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags,
                 ctx->t.tmr.function = timerfd_tmrproc;
         }
 
-        if (texp.tv64 != 0) {
+        if (texp != 0) {
                 if (isalarm(ctx)) {
                         if (flags & TFD_TIMER_ABSTIME)
                                 alarm_start(&ctx->t.alarm, texp);
@@ -261,9 +261,9 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count,
         if (ctx->ticks) {
                 ticks = ctx->ticks;
 
-                if (ctx->expired && ctx->tintv.tv64) {
+                if (ctx->expired && ctx->tintv) {
                         /*
-                         * If tintv.tv64 != 0, this is a periodic timer that
+                         * If tintv != 0, this is a periodic timer that
                          * needs to be re-armed. We avoid doing it in the timer
                          * callback to avoid DoS attacks specifying a very
                          * short timer period.
@@ -410,7 +410,7 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags)
         else
                 hrtimer_init(&ctx->t.tmr, clockid, HRTIMER_MODE_ABS);
 
-        ctx->moffs = ktime_mono_to_real((ktime_t){ .tv64 = 0 });
+        ctx->moffs = ktime_mono_to_real(0);
 
         ufd = anon_inode_getfd("[timerfd]", &timerfd_fops, ctx,
                                O_RDWR | (flags & TFD_SHARED_FCNTL_FLAGS));
@@ -469,7 +469,7 @@ static int do_timerfd_settime(int ufd, int flags,
          * We do not update "ticks" and "expired" since the timer will be
          * re-programmed again in the following timerfd_setup() call.
          */
-        if (ctx->expired && ctx->tintv.tv64) {
+        if (ctx->expired && ctx->tintv) {
                 if (isalarm(ctx))
                         alarm_forward_now(&ctx->t.alarm, ctx->tintv);
                 else
@@ -499,7 +499,7 @@ static int do_timerfd_gettime(int ufd, struct itimerspec *t)
         ctx = f.file->private_data;
 
         spin_lock_irq(&ctx->wqh.lock);
-        if (ctx->expired && ctx->tintv.tv64) {
+        if (ctx->expired && ctx->tintv) {
                 ctx->expired = 0;
 
                 if (isalarm(ctx)) {