Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292200
b: refs/heads/master
c: 94b991d
h: refs/heads/master
v: v3
  • Loading branch information
Guenter Roeck authored and Guenter Roeck committed Mar 19, 2012
1 parent 4622fa3 commit 51aada8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 27b9de3c4ae302c51d99187047e6ebebb21fd29b
refs/heads/master: 94b991d4c780b98bcf36451ab4839f35c19d5e32
19 changes: 11 additions & 8 deletions trunk/drivers/hwmon/adm1029.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,9 @@ static ssize_t set_fan_div(struct device *dev,
}

/*
Access rights on sysfs, S_IRUGO stand for Is Readable by User, Group and Others
S_IWUSR stand for Is Writable by User
*/
* Access rights on sysfs. S_IRUGO: Is Readable by User, Group and Others
* S_IWUSR: Is Writable by User.
*/
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2);
Expand Down Expand Up @@ -303,7 +303,8 @@ static int adm1029_detect(struct i2c_client *client,
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -ENODEV;

/* ADM1029 doesn't have CHIP ID, check just MAN ID
/*
* ADM1029 doesn't have CHIP ID, check just MAN ID
* For better detection we check also ADM1029_TEMP_DEVICES_INSTALLED,
* ADM1029_REG_NB_FAN_SUPPORT and compare it with possible values
* documented
Expand All @@ -321,8 +322,10 @@ static int adm1029_detect(struct i2c_client *client,
return -ENODEV;

if ((chip_id & 0xF0) != 0x00) {
/* There are no "official" CHIP ID, so actually
* we use Major/Minor revision for that */
/*
* There are no "official" CHIP ID, so actually
* we use Major/Minor revision for that
*/
pr_info("adm1029: Unknown major revision %x, "
"please let us know\n", chip_id);
return -ENODEV;
Expand Down Expand Up @@ -407,8 +410,8 @@ static int adm1029_remove(struct i2c_client *client)
}

/*
function that update the status of the chips (temperature for example)
*/
* function that update the status of the chips (temperature for example)
*/
static struct adm1029_data *adm1029_update_device(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
Expand Down

0 comments on commit 51aada8

Please sign in to comment.