Changeset 479 for GPL/trunk/include/linux/time.h

Timestamp:

May 1, 2010, 9:49:10 PM (15 years ago)

Author:

David Azarewicz

Message:

Cleanup compiler warnings

File:

• GPL/trunk/include/linux/time.h (modified) (3 diffs)

GPL/trunk/include/linux/time.h

@@ -46 +46 @@
         value->tv_sec = jiffies / HZ;
 }
- 
+
 struct timeval {
         time_t          tv_sec;         /* seconds */
@@ -94 +94 @@
 static __inline__ unsigned int jiffies_to_msecs(const unsigned long j)
 {
-        if (HZ <= 1000 && !(1000 % HZ))
+#if (HZ <= 1000 && !(1000 % HZ))
                 return (1000 / HZ) * j;
-        else if (HZ > 1000 && !(HZ % 1000))
+#elif (HZ > 1000 && !(HZ % 1000))
                 return (j + (HZ / 1000) - 1)/(HZ / 1000);
-        else
+#else
                 return (j * 1000) / HZ;
+#endif
 }
 static __inline__ unsigned long msecs_to_jiffies(const unsigned int m)
@@ -105 +106 @@
         if (m > jiffies_to_msecs(MAX_JIFFY_OFFSET))
                 return MAX_JIFFY_OFFSET;
-        if (HZ <= 1000 && !(1000 % HZ))
+#if (HZ <= 1000 && !(1000 % HZ))
                 return (m + (1000 / HZ) - 1) / (1000 / HZ);
-        else if (HZ > 1000 && !(HZ % 1000))
+#elif (HZ > 1000 && !(HZ % 1000))
                 return m * (HZ / 1000);
-        else
+#else
                 return (m * HZ + 999) / 1000;
+#endif
 }
 #endif