Changeset 2658

Timestamp:

08/12/04 21:51:04 (9 years ago)

Author:

khali

Message:

Backport some cleanups and fixes from 2.6.

Files:

• lm-sensors/trunk/kernel/chips/adm9240.c (modified) (10 diffs)

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

@@ -2 +2 @@
     adm9240.c - Part of lm_sensors, Linux kernel modules for hardware
              monitoring
-    Copyright (c) 1999  Frodo Looijaard <frodol@dds.nl>
+    Copyright (C) 1999  Frodo Looijaard <frodol@dds.nl>
     and Philip Edelbrock <phil@netroedge.com>
 
@@ -54 +54 @@
 #include <linux/init.h>
 #include "version.h"
-
-MODULE_LICENSE("GPL");
 
 /* Addresses to scan */
@@ -127 +125 @@
    these macros are called: arguments may be evaluated more than once.
    Fixing this is just not worth it. */
-#define IN_TO_REG(val,nr) (SENSORS_LIMIT(((val) & 0xff),0,255))
+#define IN_TO_REG(val,nr) (SENSORS_LIMIT((val), 0, 255))
 #define IN_FROM_REG(val,nr) (val)
 
@@ -142 +140 @@
                                (val)==255?0:1350000/((div)*(val)))
 
-#define TEMP_FROM_REG(temp) \
-   ((temp)<256?((((temp)&0x1fe) >> 1) * 10)      + ((temp) & 1) * 5:  \
-               ((((temp)&0x1fe) >> 1) -255) * 10 - ((temp) & 1) * 5)  \
-
-#define TEMP_LIMIT_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10)
-
-#define TEMP_LIMIT_TO_REG(val) SENSORS_LIMIT(((val)<0?(((val)-5)/10):\
+#define TEMP_FROM_REG(temp) ((temp)<256 ? (temp) * 5 : \
+                             ((temp) - 512) * 5)
+
+#define TEMP_LIMIT_FROM_REG(val) (((val)>=0x80?(val)-0x100:(val))*10)
+
+#define TEMP_LIMIT_TO_REG(val) SENSORS_LIMIT(((val)<0?(((val)-5)/10)+256:\
                                                       ((val)+5)/10), \
                                              0,255)
@@ -160 +157 @@
                            205-(val)*5)
 
-/* For each registered ADM9240, we need to keep some data in memory. That
-   data is pointed to by adm9240_list[NR]->data. The structure itself is
-   dynamically allocated, at the same time when a new adm9240 client is
-   allocated. */
+/* For each registered ADM9240, we need to keep some data in memory. */
 struct adm9240_data {
         struct i2c_client client;
@@ -193 +187 @@
 static int adm9240_detach_client(struct i2c_client *client);
 
-static int adm9240_read_value(struct i2c_client *client, u8 register);
-static int adm9240_write_value(struct i2c_client *client, u8 register,
-                               u8 value);
+static int adm9240_read_value(struct i2c_client *client, u8 reg);
+static int adm9240_write_value(struct i2c_client *client, u8 reg, u8 value);
 static void adm9240_update_client(struct i2c_client *client);
 static void adm9240_init_client(struct i2c_client *client);
@@ -308 +301 @@
         const char *client_name = "";
 
-        /* Make sure we aren't probing the ISA bus!! This is just a safety check
-           at this moment; i2c_detect really won't call us. */
-#ifdef DEBUG
-        if (i2c_is_isa_adapter(adapter)) {
-                printk
-                    ("adm9240.o: adm9240_detect called for an ISA bus adapter?!?\n");
-                return 0;
-        }
-#endif
-
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 goto ERROR0;
@@ -444 +427 @@
 static int adm9240_read_value(struct i2c_client *client, u8 reg)
 {
-        return 0xFF & i2c_smbus_read_byte_data(client, reg);
+        return i2c_smbus_read_byte_data(client, reg);
 }
 
@@ -452 +435 @@
 }
 
-/* Called when we have found a new ADM9240. It should set limits, etc. */
+/* Called when we have found a new ADM9240. */
 static void adm9240_init_client(struct i2c_client *client)
 {
@@ -723 +706 @@
 MODULE_AUTHOR
     ("Frodo Looijaard <frodol@dds.nl> and Philip Edelbrock <phil@netroedge.com>");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("ADM9240 driver");