Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / include / linux / ktime.h

diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index b4fa5e4..debf208 100644 (file)
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -229,7 +229,8 @@ static inline ktime_t timespec_to_ktime(const struct timespec ts)
 static inline ktime_t timeval_to_ktime(const struct timeval tv)
 {
        return (ktime_t) { .tv = { .sec = (s32)tv.tv_sec,
-                                  .nsec = (s32)tv.tv_usec * 1000 } };
+                                  .nsec = (s32)(tv.tv_usec *
+                                                NSEC_PER_USEC) } };
 }
 
 /**
@@ -320,7 +321,7 @@ static inline s64 ktime_us_delta(const ktime_t later, const ktime_t earlier)
 
 static inline ktime_t ktime_add_us(const ktime_t kt, const u64 usec)
 {
-       return ktime_add_ns(kt, usec * 1000);
+       return ktime_add_ns(kt, usec * NSEC_PER_USEC);
 }
 
 static inline ktime_t ktime_add_ms(const ktime_t kt, const u64 msec)
@@ -330,7 +331,7 @@ static inline ktime_t ktime_add_ms(const ktime_t kt, const u64 msec)
 
 static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)
 {
-       return ktime_sub_ns(kt, usec * 1000);
+       return ktime_sub_ns(kt, usec * NSEC_PER_USEC);
 }
 
 extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);
@@ -343,7 +344,8 @@ extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);
  *
  * Returns true if there was a successful conversion, false if kt was 0.
  */
-static inline bool ktime_to_timespec_cond(const ktime_t kt, struct timespec *ts)
+static inline __must_check bool ktime_to_timespec_cond(const ktime_t kt,
+                                                      struct timespec *ts)
 {
        if (kt.tv64) {
                *ts = ktime_to_timespec(kt);