aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGuenter Roeck <guenter.roeck@ericsson.com>2011-03-09 10:23:54 -0500
committerGuenter Roeck <guenter.roeck@ericsson.com>2011-05-19 11:19:39 -0400
commit6586b14c7bdec22f59dc749ead1d01d542d793b6 (patch)
treeb29738f3a07f670013e0a854c0151a7a78304a03 /drivers
parent2cfa6aedb32c9c1226094ed383dc3c9b3e2ecddb (diff)
hwmon: (pmbus) Use device specific function to read fan configuration
Fan control implementation tends to be device specific, so start using the device specific function call to read fan configuration registers. Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Reviewed-by: Tom Grennan <tom.grennan@ericsson.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/pmbus_core.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hwmon/pmbus_core.c b/drivers/hwmon/pmbus_core.c
index 43ec1057c1f7..98799bab69ce 100644
--- a/drivers/hwmon/pmbus_core.c
+++ b/drivers/hwmon/pmbus_core.c
@@ -1295,9 +1295,7 @@ static void pmbus_add_fan_attributes(struct i2c_client *client,
1295 break; 1295 break;
1296 1296
1297 if (!pmbus_check_word_register(client, page, 1297 if (!pmbus_check_word_register(client, page,
1298 pmbus_fan_registers[f]) 1298 pmbus_fan_registers[f]))
1299 || !pmbus_check_byte_register(client, page,
1300 pmbus_fan_config_registers[f]))
1301 break; 1299 break;
1302 1300
1303 /* 1301 /*
@@ -1305,7 +1303,7 @@ static void pmbus_add_fan_attributes(struct i2c_client *client,
1305 * Each fan configuration register covers multiple fans, 1303 * Each fan configuration register covers multiple fans,
1306 * so we have to do some magic. 1304 * so we have to do some magic.
1307 */ 1305 */
1308 regval = pmbus_read_byte_data(client, page, 1306 regval = _pmbus_read_byte_data(client, page,
1309 pmbus_fan_config_registers[f]); 1307 pmbus_fan_config_registers[f]);
1310 if (regval < 0 || 1308 if (regval < 0 ||
1311 (!(regval & (PB_FAN_1_INSTALLED >> ((f & 1) * 4))))) 1309 (!(regval & (PB_FAN_1_INSTALLED >> ((f & 1) * 4)))))