summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGrant Coady <grant_lkml@dodo.com.au>2005-05-13 20:26:10 +1000
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 21:51:57 -0700
commit8e8f9289cc5b781d583d5aed935abf060207bbd3 (patch)
treed058803efab6b2f359ca750ec50e73681da3ce8d /drivers
parent937df8df907ce63b0f7e19adf6e3cdef1687fac3 (diff)
downloadlwn-8e8f9289cc5b781d583d5aed935abf060207bbd3.tar.gz
lwn-8e8f9289cc5b781d583d5aed935abf060207bbd3.zip
[PATCH] I2C: adm9240 driver cleanup
This patch adds an info print of detected VRM stolen from Sebastian Witt's atxp1 sriver. ADM9240 already has vrm accessor removed. Write no-op and whitespace fixes removed :) Couple of comments changed, tested on 2.6.11.9. Signed-off-by: Grant Coady <gcoady@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/chips/adm9240.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/i2c/chips/adm9240.c b/drivers/i2c/chips/adm9240.c
index 0b67eab15d2d..6d609d89e790 100644
--- a/drivers/i2c/chips/adm9240.c
+++ b/drivers/i2c/chips/adm9240.c
@@ -165,7 +165,7 @@ struct adm9240_data {
s8 temp_high; /* rw temp1_max */
s8 temp_hyst; /* rw temp1_max_hyst */
u16 alarms; /* ro alarms */
- u8 aout; /* rw analog_out */
+ u8 aout; /* rw aout_output */
u8 vid; /* ro vid */
u8 vrm; /* -- vrm set on startup, no accessor */
};
@@ -192,7 +192,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \
}
show_temp(temp_high, 1000);
show_temp(temp_hyst, 1000);
-show_temp(temp, 500);
+show_temp(temp, 500); /* 0.5'C per bit */
#define set_temp(value, reg) \
static ssize_t set_##value(struct device *dev, const char *buf, \
@@ -630,6 +630,9 @@ static void adm9240_init_client(struct i2c_client *client)
data->vrm = i2c_which_vrm(); /* need this to report vid as mV */
+ dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10,
+ data->vrm % 10);
+
if (conf & 1) { /* measurement cycle running: report state */
dev_info(&client->dev, "status: config 0x%02x mode %u\n",