aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/lm90.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-03-23 05:02:18 -0400
committerJean Delvare <khali@endymion.delvare>2012-03-23 05:02:18 -0400
commitf36ffeab0a1d0a0a56edd39be7a97a07486305e8 (patch)
tree365a71c0b85e3d8f2c7e537725aad94390691fce /drivers/hwmon/lm90.c
parentc10b3ee8aa7b26875a8ec0afb6f6323810b35043 (diff)
hwmon: (lm90) Fix multi-line comments
Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon/lm90.c')
-rw-r--r--drivers/hwmon/lm90.c58
1 files changed, 34 insertions, 24 deletions
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 248f2b40dfaf..22efae34c2f6 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -308,22 +308,24 @@ struct lm90_data {
308 308
309 /* registers values */ 309 /* registers values */
310 s8 temp8[8]; /* 0: local low limit 310 s8 temp8[8]; /* 0: local low limit
311 1: local high limit 311 * 1: local high limit
312 2: local critical limit 312 * 2: local critical limit
313 3: remote critical limit 313 * 3: remote critical limit
314 4: local emergency limit (max6659 and max6695/96) 314 * 4: local emergency limit (max6659 and max6695/96)
315 5: remote emergency limit (max6659 and max6695/96) 315 * 5: remote emergency limit (max6659 and max6695/96)
316 6: remote 2 critical limit (max6695/96 only) 316 * 6: remote 2 critical limit (max6695/96 only)
317 7: remote 2 emergency limit (max6695/96 only) */ 317 * 7: remote 2 emergency limit (max6695/96 only)
318 */
318 s16 temp11[8]; /* 0: remote input 319 s16 temp11[8]; /* 0: remote input
319 1: remote low limit 320 * 1: remote low limit
320 2: remote high limit 321 * 2: remote high limit
321 3: remote offset (except max6646, max6657/58/59, 322 * 3: remote offset (except max6646, max6657/58/59,
322 and max6695/96) 323 * and max6695/96)
323 4: local input 324 * 4: local input
324 5: remote 2 input (max6695/96 only) 325 * 5: remote 2 input (max6695/96 only)
325 6: remote 2 low limit (max6695/96 only) 326 * 6: remote 2 low limit (max6695/96 only)
326 7: remote 2 high limit (ma6695/96 only) */ 327 * 7: remote 2 high limit (max6695/96 only)
328 */
327 u8 temp_hyst; 329 u8 temp_hyst;
328 u16 alarms; /* bitvector (upper 8 bits for max6695/96) */ 330 u16 alarms; /* bitvector (upper 8 bits for max6695/96) */
329}; 331};
@@ -533,8 +535,10 @@ static struct lm90_data *lm90_update_device(struct device *dev)
533 data->alarms |= alarms << 8; 535 data->alarms |= alarms << 8;
534 } 536 }
535 537
536 /* Re-enable ALERT# output if it was originally enabled and 538 /*
537 * relevant alarms are all clear */ 539 * Re-enable ALERT# output if it was originally enabled and
540 * relevant alarms are all clear
541 */
538 if ((data->config_orig & 0x80) == 0 542 if ((data->config_orig & 0x80) == 0
539 && (data->alarms & data->alert_alarms) == 0) { 543 && (data->alarms & data->alert_alarms) == 0) {
540 u8 config; 544 u8 config;
@@ -1162,8 +1166,10 @@ static int lm90_detect(struct i2c_client *client,
1162 && (config1 & 0x3F) == 0x00 1166 && (config1 & 0x3F) == 0x00
1163 && convrate <= 0x0A) { 1167 && convrate <= 0x0A) {
1164 name = "adm1032"; 1168 name = "adm1032";
1165 /* The ADM1032 supports PEC, but only if combined 1169 /*
1166 transactions are not used. */ 1170 * The ADM1032 supports PEC, but only if combined
1171 * transactions are not used.
1172 */
1167 if (i2c_check_functionality(adapter, 1173 if (i2c_check_functionality(adapter,
1168 I2C_FUNC_SMBUS_BYTE)) 1174 I2C_FUNC_SMBUS_BYTE))
1169 info->flags |= I2C_CLIENT_PEC; 1175 info->flags |= I2C_CLIENT_PEC;
@@ -1382,8 +1388,10 @@ static int lm90_probe(struct i2c_client *client,
1382 client->flags &= ~I2C_CLIENT_PEC; 1388 client->flags &= ~I2C_CLIENT_PEC;
1383 } 1389 }
1384 1390
1385 /* Different devices have different alarm bits triggering the 1391 /*
1386 * ALERT# output */ 1392 * Different devices have different alarm bits triggering the
1393 * ALERT# output
1394 */
1387 data->alert_alarms = lm90_params[data->kind].alert_alarms; 1395 data->alert_alarms = lm90_params[data->kind].alert_alarms;
1388 1396
1389 /* Set chip capabilities */ 1397 /* Set chip capabilities */
@@ -1488,9 +1496,11 @@ static void lm90_alert(struct i2c_client *client, unsigned int flag)
1488 dev_warn(&client->dev, 1496 dev_warn(&client->dev,
1489 "temp%d out of range, please check!\n", 3); 1497 "temp%d out of range, please check!\n", 3);
1490 1498
1491 /* Disable ALERT# output, because these chips don't implement 1499 /*
1492 SMBus alert correctly; they should only hold the alert line 1500 * Disable ALERT# output, because these chips don't implement
1493 low briefly. */ 1501 * SMBus alert correctly; they should only hold the alert line
1502 * low briefly.
1503 */
1494 if ((data->flags & LM90_HAVE_BROKEN_ALERT) 1504 if ((data->flags & LM90_HAVE_BROKEN_ALERT)
1495 && (alarms & data->alert_alarms)) { 1505 && (alarms & data->alert_alarms)) {
1496 dev_dbg(&client->dev, "Disabling ALERT#\n"); 1506 dev_dbg(&client->dev, "Disabling ALERT#\n");