Changeset 479 for GPL/trunk/include/linux

Timestamp:

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

Author:

David Azarewicz

Message:

Cleanup compiler warnings

Location:

GPL/trunk/include/linux

Files:

• math64.h (modified) (2 diffs)
• pci.h (modified) (4 diffs)
• time.h (modified) (3 diffs)

GPL/trunk/include/linux/math64.h

@@ -63 +63 @@
         u32 q1 = 0;
         int c = 32;
-        while (n > 0xffffffffU) {
+        while (n > 0xffffffffUi64) {
                 q1 <<= 1;
                 if (n >= d) {
@@ -110 +110 @@
                 u32 low1 = low;
                 high /= div;
-                divl(high1, low1, div, &low, rem);
+                divl(high1, low1, div, &low, &rem);
                 return (u64)high << 32 | low;
         } else {

GPL/trunk/include/linux/pci.h

@@ -73 +73 @@
 /*
  * Base addresses specify locations in memory or I/O space.
- * Decoded size can be determined by writing a value of 
- * 0xffffffff to the register, and reading it back.  Only 
+ * Decoded size can be determined by writing a value of
+ * 0xffffffff to the register, and reading it back.  Only
  * 1 bits are decoded.
  */
@@ -98 +98 @@
 #define PCI_CARDBUS_CIS         0x28
 #define PCI_SUBSYSTEM_VENDOR_ID 0x2c
-#define PCI_SUBSYSTEM_ID        0x2e  
+#define PCI_SUBSYSTEM_ID        0x2e
 #define PCI_ROM_ADDRESS         0x30    /* Bits 31..11 are address, 10..1 reserved */
 #define  PCI_ROM_ADDRESS_ENABLE 0x01
@@ -389 +389 @@
 #define PCI_BRIDGE_RESOURCES 7
 #define PCI_NUM_RESOURCES 11
-  
+
 #define PCI_REGION_FLAG_MASK 0x0f       /* These bits of resource flags tell us the PCI region flags */
 
@@ -517 +517 @@
  * simple PCI probing for drivers (drivers/pci/helper.c)
  */
- 
+
 struct pci_simple_probe_entry;
 typedef int (*pci_simple_probe_callback) (struct pci_dev *dev, int match_num,

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