git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git] / drivers / i2c / chips / lm78.c
diff --git a/drivers/i2c/chips/lm78.c b/drivers/i2c/chips/lm78.c
index 74a1ca7..40385ff 100644 (file)
--- a/drivers/i2c/chips/lm78.c
+++ b/drivers/i2c/chips/lm78.c
@@ -123,55 +123,6 @@ static inline u8 DIV_TO_REG(int val)
 }
 #define DIV_FROM_REG(val) (1 << (val))
 
-/* Initial limits. To keep them sane, we use the 'standard' translation as
-   specified in the LM78 sheet. Use the config file to set better limits. */
-#define LM78_INIT_IN_0(vid) ((vid)==3500 ? 2800 : (vid))
-#define LM78_INIT_IN_1(vid) ((vid)==3500 ? 2800 : (vid))
-#define LM78_INIT_IN_2 3300
-#define LM78_INIT_IN_3 (((5000)   * 100)/168)
-#define LM78_INIT_IN_4 (((12000)  * 10)/38)
-#define LM78_INIT_IN_5 (((-12000) * -604)/2100)
-#define LM78_INIT_IN_6 (((-5000)  * -604)/909)
-
-#define LM78_INIT_IN_PERCENTAGE 10
-
-#define LM78_INIT_IN_MIN_0(vid) (LM78_INIT_IN_0(vid) - \
-       LM78_INIT_IN_0(vid) * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MAX_0(vid) (LM78_INIT_IN_0(vid) + \
-       LM78_INIT_IN_0(vid) * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MIN_1(vid) (LM78_INIT_IN_1(vid) - \
-       LM78_INIT_IN_1(vid) * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MAX_1(vid) (LM78_INIT_IN_1(vid) + \
-       LM78_INIT_IN_1(vid) * LM78_INIT_IN_PERCENTAGE / 100)
-
-#define LM78_INIT_IN_MIN_2 \
-        (LM78_INIT_IN_2 - LM78_INIT_IN_2 * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MAX_2 \
-        (LM78_INIT_IN_2 + LM78_INIT_IN_2 * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MIN_3 \
-        (LM78_INIT_IN_3 - LM78_INIT_IN_3 * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MAX_3 \
-        (LM78_INIT_IN_3 + LM78_INIT_IN_3 * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MIN_4 \
-        (LM78_INIT_IN_4 - LM78_INIT_IN_4 * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MAX_4 \
-        (LM78_INIT_IN_4 + LM78_INIT_IN_4 * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MIN_5 \
-        (LM78_INIT_IN_5 - LM78_INIT_IN_5 * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MAX_5 \
-        (LM78_INIT_IN_5 + LM78_INIT_IN_5 * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MIN_6 \
-        (LM78_INIT_IN_6 - LM78_INIT_IN_6 * LM78_INIT_IN_PERCENTAGE / 100)
-#define LM78_INIT_IN_MAX_6 \
-        (LM78_INIT_IN_6 + LM78_INIT_IN_6 * LM78_INIT_IN_PERCENTAGE / 100)
-
-#define LM78_INIT_FAN_MIN_1 3000
-#define LM78_INIT_FAN_MIN_2 3000
-#define LM78_INIT_FAN_MIN_3 3000
-
-#define LM78_INIT_TEMP_OVER 60000
-#define LM78_INIT_TEMP_HYST 50000
-
 /* There are some complications in a module like this. First off, LM78 chips
    may be both present on the SMBus and the ISA bus, and we have to handle
    those cases separately at some places. Second, there might be several
@@ -281,7 +232,7 @@ static ssize_t                                                      \
        return show_in(dev, buf, 0x##offset);                   \
 }                                                              \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO,                \
-               show_in##offset, NULL)                          \
+               show_in##offset, NULL);                         \
 static ssize_t                                                 \
        show_in##offset##_min (struct device *dev, char *buf)   \
 {                                                              \
@@ -303,9 +254,9 @@ static ssize_t set_in##offset##_max (struct device *dev,    \
        return set_in_max(dev, buf, count, 0x##offset);         \
 }                                                              \
 static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,                \
-               show_in##offset##_min, set_in##offset##_min)    \
+               show_in##offset##_min, set_in##offset##_min);   \
 static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,                \
-               show_in##offset##_max, set_in##offset##_max)
+               show_in##offset##_max, set_in##offset##_max);
 
 show_in_offset(0);
 show_in_offset(1);
@@ -354,11 +305,11 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf, size_t count)
        return count;
 }
 
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL)
+static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL);
 static DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR,
-               show_temp_over, set_temp_over)
+               show_temp_over, set_temp_over);
 static DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR,
-               show_temp_hyst, set_temp_hyst)
+               show_temp_hyst, set_temp_hyst);
 
 /* 3 Fans */
 static ssize_t show_fan(struct device *dev, char *buf, int nr)
@@ -439,9 +390,9 @@ static ssize_t set_fan_##offset##_min (struct device *dev,          \
 {                                                                      \
        return set_fan_min(dev, buf, count, 0x##offset - 1);            \
 }                                                                      \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL) \
+static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\
 static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,               \
-               show_fan_##offset##_min, set_fan_##offset##_min)
+               show_fan_##offset##_min, set_fan_##offset##_min);
 
 static ssize_t set_fan_1_div(struct device *dev, const char *buf,
                size_t count)
@@ -461,10 +412,10 @@ show_fan_offset(3);
 
 /* Fan 3 divisor is locked in H/W */
 static DEVICE_ATTR(fan1_div, S_IRUGO | S_IWUSR,
-               show_fan_1_div, set_fan_1_div)
+               show_fan_1_div, set_fan_1_div);
 static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
-               show_fan_2_div, set_fan_2_div)
-static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL)
+               show_fan_2_div, set_fan_2_div);
+static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL);
 
 /* VID */
 static ssize_t show_vid(struct device *dev, char *buf)
@@ -756,45 +707,6 @@ static void lm78_init_client(struct i2c_client *client)
                vid |= 0x10;
        vid = VID_FROM_REG(vid);
 
-       lm78_write_value(client, LM78_REG_IN_MIN(0),
-                        IN_TO_REG(LM78_INIT_IN_MIN_0(vid)));
-       lm78_write_value(client, LM78_REG_IN_MAX(0),
-                        IN_TO_REG(LM78_INIT_IN_MAX_0(vid)));
-       lm78_write_value(client, LM78_REG_IN_MIN(1),
-                        IN_TO_REG(LM78_INIT_IN_MIN_1(vid)));
-       lm78_write_value(client, LM78_REG_IN_MAX(1),
-                        IN_TO_REG(LM78_INIT_IN_MAX_1(vid)));
-       lm78_write_value(client, LM78_REG_IN_MIN(2),
-                        IN_TO_REG(LM78_INIT_IN_MIN_2));
-       lm78_write_value(client, LM78_REG_IN_MAX(2),
-                        IN_TO_REG(LM78_INIT_IN_MAX_2));
-       lm78_write_value(client, LM78_REG_IN_MIN(3),
-                        IN_TO_REG(LM78_INIT_IN_MIN_3));
-       lm78_write_value(client, LM78_REG_IN_MAX(3),
-                        IN_TO_REG(LM78_INIT_IN_MAX_3));
-       lm78_write_value(client, LM78_REG_IN_MIN(4),
-                        IN_TO_REG(LM78_INIT_IN_MIN_4));
-       lm78_write_value(client, LM78_REG_IN_MAX(4),
-                        IN_TO_REG(LM78_INIT_IN_MAX_4));
-       lm78_write_value(client, LM78_REG_IN_MIN(5),
-                        IN_TO_REG(LM78_INIT_IN_MIN_5));
-       lm78_write_value(client, LM78_REG_IN_MAX(5),
-                        IN_TO_REG(LM78_INIT_IN_MAX_5));
-       lm78_write_value(client, LM78_REG_IN_MIN(6),
-                        IN_TO_REG(LM78_INIT_IN_MIN_6));
-       lm78_write_value(client, LM78_REG_IN_MAX(6),
-                        IN_TO_REG(LM78_INIT_IN_MAX_6));
-       lm78_write_value(client, LM78_REG_FAN_MIN(0),
-                        FAN_TO_REG(LM78_INIT_FAN_MIN_1, 2));
-       lm78_write_value(client, LM78_REG_FAN_MIN(1),
-                        FAN_TO_REG(LM78_INIT_FAN_MIN_2, 2));
-       lm78_write_value(client, LM78_REG_FAN_MIN(2),
-                        FAN_TO_REG(LM78_INIT_FAN_MIN_3, 2));
-       lm78_write_value(client, LM78_REG_TEMP_OVER,
-                        TEMP_TO_REG(LM78_INIT_TEMP_OVER));
-       lm78_write_value(client, LM78_REG_TEMP_HYST,
-                        TEMP_TO_REG(LM78_INIT_TEMP_HYST));
-
        /* Start monitoring */
        lm78_write_value(client, LM78_REG_CONFIG,
                         (lm78_read_value(client, LM78_REG_CONFIG) & 0xf7)
linux-2.6