Merge branch 'topic/asoc' into for-linus

[sfrench/cifs-2.6.git] / drivers / hwmon / adm1026.c

diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 7fe2441fc8455f93fc175ddeaa12531f5777cb2b..ff7de40b6e35267c2836b03a98d4017e74e6414e 100644 (file)
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -279,7 +279,6 @@ struct adm1026_data {
        u8 fan_min[8];          /* Register value */
        u8 fan_div[8];          /* Decoded value */
        struct pwm_data pwm1;   /* Pwm control values */
-       int vid;                /* Decoded value */
        u8 vrm;                 /* VRM version */
        u8 analog_out;          /* Register value (DAC) */
        long alarms;            /* Register encoding, combined */
@@ -455,7 +454,7 @@ static void adm1026_print_gpio(struct i2c_client *client)
        struct adm1026_data *data = i2c_get_clientdata(client);
        int i;
 
-       dev_dbg(&client->dev, "GPIO config is:");
+       dev_dbg(&client->dev, "GPIO config is:\n");
        for (i = 0;i <= 7;++i) {
                if (data->config2 & (1 << i)) {
                        dev_dbg(&client->dev, "\t%sGP%s%d\n",
@@ -697,8 +696,6 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)
                data->last_config = jiffies;
        }; /* last_config */
 
-       dev_dbg(&client->dev, "Setting VID from GPIO11-15.\n");
-       data->vid = (data->gpio >> 11) & 0x1f;
        data->valid = 1;
        mutex_unlock(&data->update_lock);
        return data;
@@ -1215,7 +1212,10 @@ static DEVICE_ATTR(analog_out, S_IRUGO | S_IWUSR, show_analog_out_reg,
 static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct adm1026_data *data = adm1026_update_device(dev);
-       return sprintf(buf, "%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
+       int vid = (data->gpio >> 11) & 0x1f;
+
+       dev_dbg(dev, "Setting VID from GPIO11-15.\n");
+       return sprintf(buf, "%d\n", vid_from_reg(vid, data->vrm));
 }
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 
@@ -1681,17 +1681,16 @@ static int adm1026_detect(struct i2c_client *client, int kind,
                        kind = adm1026;
                } else if (company == ADM1026_COMPANY_ANALOG_DEV
                        && (verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) {
-                       dev_err(&adapter->dev, ": Unrecognized stepping "
+                       dev_err(&adapter->dev, "Unrecognized stepping "
                                "0x%02x. Defaulting to ADM1026.\n", verstep);
                        kind = adm1026;
                } else if ((verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) {
-                       dev_err(&adapter->dev, ": Found version/stepping "
+                       dev_err(&adapter->dev, "Found version/stepping "
                                "0x%02x. Assuming generic ADM1026.\n",
                                verstep);
                        kind = any_chip;
                } else {
-                       dev_dbg(&adapter->dev, ": Autodetection "
-                               "failed\n");
+                       dev_dbg(&adapter->dev, "Autodetection failed\n");
                        /* Not an ADM1026 ... */
                        if (kind == 0) { /* User used force=x,y */
                                dev_err(&adapter->dev, "Generic ADM1026 not "