Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347358
b: refs/heads/master
c: 1d9bcf6
h: refs/heads/master
v: v3
  • Loading branch information
Guenter Roeck authored and Jean Delvare committed Dec 19, 2012
1 parent 58321c8 commit 62b7389
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 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: e1169ba0aea187d0ea15d6f98bc818cab37335e5
refs/heads/master: 1d9bcf6aef0af67901a54ad4c4458e6a2124b769
27 changes: 13 additions & 14 deletions trunk/drivers/hwmon/it87.c
Original file line number Diff line number Diff line change
Expand Up @@ -644,8 +644,8 @@ static ssize_t set_temp_type(struct device *dev, struct device_attribute *attr,
reg &= ~(1 << nr);
reg &= ~(8 << nr);
if (val == 2) { /* backwards compatibility */
dev_warn(dev, "Sensor type 2 is deprecated, please use 4 "
"instead\n");
dev_warn(dev,
"Sensor type 2 is deprecated, please use 4 instead\n");
val = 4;
}
/* 3 = thermal diode; 4 = thermistor; 0 = disabled */
Expand Down Expand Up @@ -847,8 +847,8 @@ static int check_trip_points(struct device *dev, int nr)
}

if (err) {
dev_err(dev, "Inconsistent trip points, not switching to "
"automatic mode\n");
dev_err(dev,
"Inconsistent trip points, not switching to automatic mode\n");
dev_err(dev, "Adjust the trip points and try again\n");
}
return err;
Expand Down Expand Up @@ -2176,8 +2176,8 @@ static int it87_check_pwm(struct device *dev)
* PWM interface).
*/
if (!((pwm[0] | pwm[1] | pwm[2]) & 0x80)) {
dev_info(dev, "Reconfiguring PWM to "
"active high polarity\n");
dev_info(dev,
"Reconfiguring PWM to active high polarity\n");
it87_write_value(data, IT87_REG_FAN_CTL,
tmp | 0x87);
for (i = 0; i < 3; i++)
Expand All @@ -2187,16 +2187,16 @@ static int it87_check_pwm(struct device *dev)
return 1;
}

dev_info(dev, "PWM configuration is "
"too broken to be fixed\n");
dev_info(dev,
"PWM configuration is too broken to be fixed\n");
}

dev_info(dev, "Detected broken BIOS "
"defaults, disabling PWM interface\n");
dev_info(dev,
"Detected broken BIOS defaults, disabling PWM interface\n");
return 0;
} else if (fix_pwm_polarity) {
dev_info(dev, "PWM configuration looks "
"sane, won't touch\n");
dev_info(dev,
"PWM configuration looks sane, won't touch\n");
}

return 1;
Expand Down Expand Up @@ -2508,8 +2508,7 @@ static void __exit sm_it87_exit(void)
}


MODULE_AUTHOR("Chris Gauthron, "
"Jean Delvare <khali@linux-fr.org>");
MODULE_AUTHOR("Chris Gauthron, Jean Delvare <khali@linux-fr.org>");
MODULE_DESCRIPTION("IT8705F/IT871xF/IT872xF hardware monitoring driver");
module_param(update_vbat, bool, 0);
MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value");
Expand Down

0 comments on commit 62b7389

Please sign in to comment.