Changeset 2284

Timestamp:

02/12/04 19:50:24 (9 years ago)

Author:

khali

Message:

Get rid of useless headers.

Remove useless second argument of IN_FROM_REG.
Misc cleanups.

Files:

• lm-sensors/trunk/kernel/chips/lm80.c (modified) (7 diffs)

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

@@ -22 +22 @@
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/sysctl.h>
-#include <linux/types.h>
 #include <linux/i2c.h>
 #include <linux/i2c-proc.h>
 #include <linux/init.h>
-#include <asm/errno.h>
-#include <asm/io.h>
 #include "version.h"
 
@@ -76 +70 @@
    Fixing this is just not worth it. */
 
-#define IN_TO_REG(val,nr) (SENSORS_LIMIT((val),0,255))
-#define IN_FROM_REG(val,nr) (val)
+#define IN_TO_REG(val) (SENSORS_LIMIT((val),0,255))
+#define IN_FROM_REG(val) (val)
 
 static inline unsigned char FAN_TO_REG(unsigned rpm, unsigned div)
@@ -95 +89 @@
         long res;
 
-        temp = temp >> 4;
-        if (temp < 0x0800) {
-                res = (625 * (long) temp);
-        } else {
+        temp >>= 4;
+        if (temp < 0x0800)
+                res = 625 * (long) temp;
+        else
                 res = ((long) temp - 0x01000) * 625;
-        }
+
         return res / 100;
 }
@@ -115 +109 @@
 #define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1)
 
-/* For each registered LM80, we need to keep some data in memory. That
-   data is pointed to by lm80_list[NR]->data. The structure itself is
-   dynamically allocated, at the same time when a new lm80 client is
-   allocated. */
 struct lm80_data {
         int sysctl_id;
@@ -147 +137 @@
 static int lm80_detach_client(struct i2c_client *client);
 
-static int lm80_read_value(struct i2c_client *client, u8 register);
-static int lm80_write_value(struct i2c_client *client, u8 register,
-                            u8 value);
+static int lm80_read_value(struct i2c_client *client, u8 reg);
+static int lm80_write_value(struct i2c_client *client, u8 reg, u8 value);
 static void lm80_update_client(struct i2c_client *client);
 static void lm80_init_client(struct i2c_client *client);
@@ -375 +364 @@
 }
 
-/* Called when we have found a new LM80. It should set limits, etc. */
+/* Called when we have found a new LM80. */
 static void lm80_init_client(struct i2c_client *client)
 {
@@ -465 +454 @@
         else if (operation == SENSORS_PROC_REAL_READ) {
                 lm80_update_client(client);
-                results[0] = IN_FROM_REG(data->in_min[nr], nr);
-                results[1] = IN_FROM_REG(data->in_max[nr], nr);
-                results[2] = IN_FROM_REG(data->in[nr], nr);
+                results[0] = IN_FROM_REG(data->in_min[nr]);
+                results[1] = IN_FROM_REG(data->in_max[nr]);
+                results[2] = IN_FROM_REG(data->in[nr]);
                 *nrels_mag = 3;
         } else if (operation == SENSORS_PROC_REAL_WRITE) {
                 if (*nrels_mag >= 1) {
-                        data->in_min[nr] = IN_TO_REG(results[0], nr);
+                        data->in_min[nr] = IN_TO_REG(results[0]);
                         lm80_write_value(client, LM80_REG_IN_MIN(nr),
                                          data->in_min[nr]);
                 }
                 if (*nrels_mag >= 2) {
-                        data->in_max[nr] = IN_TO_REG(results[1], nr);
+                        data->in_max[nr] = IN_TO_REG(results[1]);
                         lm80_write_value(client, LM80_REG_IN_MAX(nr),
                                          data->in_max[nr]);