Changeset 5372

Timestamp:

10/22/08 21:24:54 (5 years ago)

Author:

khali

Message:

Use inline functions instead of macros. Macros evaluating their
arguments more than once are evil. Backport from Linux 2.6.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/chips/max1619.c (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -15 +15 @@
   Module lm78: Prevent misdetection of Winbond chips
   Module lm90: Don't spam the kernel log (2.6 backport)
+  Module max1619: Use inline functions instead of macros (2.6 backport)
   Program pwmconfig: Fix MINSTOP and MINSTART test functions (#2340)
                      Change default for MINTEMP from 0 to 20 degrees C

lm-sensors/trunk/kernel/chips/max1619.c

@@ -74 +74 @@
 
 /*
- * Conversions and various macros
- */
-
-#define TEMP_FROM_REG(val)      ((val) & 0x80 ? (val)-0x100 : (val))
-#define TEMP_TO_REG(val)        ((val) < 0 ? (val)+0x100 : (val))
+ * Conversions
+ */
+
+static int temp_from_reg(int val)
+{
+        return val & 0x80 ? val-0x100 : val;
+}
+
+static int temp_to_reg(int val)
+{
+        return val < 0 ? val+0x100 : val;
+}
 
 /*
@@ -398 +405 @@
         else if (operation == SENSORS_PROC_REAL_READ) {
                 max1619_update_client(client);
-                results[0] = TEMP_FROM_REG(data->local_temp);
+                results[0] = temp_from_reg(data->local_temp);
                 *nrels_mag = 1;
         }
@@ -413 +420 @@
         else if (operation == SENSORS_PROC_REAL_READ) {
                 max1619_update_client(client);
-                results[0] = TEMP_FROM_REG(data->remote_high);
-                results[1] = TEMP_FROM_REG(data->remote_low);
-                results[2] = TEMP_FROM_REG(data->remote_temp);
+                results[0] = temp_from_reg(data->remote_high);
+                results[1] = temp_from_reg(data->remote_low);
+                results[2] = temp_from_reg(data->remote_temp);
                 *nrels_mag = 3;
         } else if (operation == SENSORS_PROC_REAL_WRITE) {
                 if (*nrels_mag >= 1) {
-                        data->remote_high = TEMP_TO_REG(results[0]);
+                        data->remote_high = temp_to_reg(results[0]);
                         i2c_smbus_write_byte_data(client,
                                 MAX1619_REG_W_REMOTE_THIGH, data->remote_high);
                 }
                 if (*nrels_mag >= 2) {
-                        data->remote_low = TEMP_TO_REG(results[1]);
+                        data->remote_low = temp_to_reg(results[1]);
                         i2c_smbus_write_byte_data(client,
                                 MAX1619_REG_W_REMOTE_TLOW, data->remote_low);
@@ -441 +448 @@
         else if (operation == SENSORS_PROC_REAL_READ) {
                 max1619_update_client(client);
-                results[0] = TEMP_FROM_REG(data->remote_max);
-                results[1] = TEMP_FROM_REG(data->remote_hyst);
+                results[0] = temp_from_reg(data->remote_max);
+                results[1] = temp_from_reg(data->remote_hyst);
                 *nrels_mag = 2;
         } else if (operation == SENSORS_PROC_REAL_WRITE) {
                 if (*nrels_mag >= 1) {
-                        data->remote_max = TEMP_TO_REG(results[0]);
+                        data->remote_max = temp_to_reg(results[0]);
                         i2c_smbus_write_byte_data(client,
                                 MAX1619_REG_W_REMOTE_TMAX, data->remote_max);
                 }
                 if (*nrels_mag >= 2) {
-                        data->remote_hyst = TEMP_TO_REG(results[1]);
+                        data->remote_hyst = temp_to_reg(results[1]);
                         i2c_smbus_write_byte_data(client,
                                 MAX1619_REG_W_REMOTE_THYST, data->remote_hyst);