aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-11-29 14:04:06 -0500
committerMatthew Garrett <mjg@redhat.com>2012-03-20 12:02:14 -0400
commiteecc5bbc612a8b008c0ef442ac8445306fbe5277 (patch)
tree8a9f7aed6a75a39a4065703994557426af411c74 /drivers/platform
parent6e71f38bdac9e7e3d598fdfe31020cdaa18b20d5 (diff)
acerhdf: Message logging neatening
Use pr_warn not pr_warning. Coalesce formats. Argument aligning. Remove superfluous parentheses. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Lee, Chun-Yi <jlee@suse.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/acerhdf.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 760c6d7624fe..bc8384c6f3eb 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -244,12 +244,11 @@ static void acerhdf_change_fanstate(int state)
244 unsigned char cmd; 244 unsigned char cmd;
245 245
246 if (verbose) 246 if (verbose)
247 pr_notice("fan %s\n", (state == ACERHDF_FAN_OFF) ? 247 pr_notice("fan %s\n", state == ACERHDF_FAN_OFF ? "OFF" : "ON");
248 "OFF" : "ON");
249 248
250 if ((state != ACERHDF_FAN_OFF) && (state != ACERHDF_FAN_AUTO)) { 249 if ((state != ACERHDF_FAN_OFF) && (state != ACERHDF_FAN_AUTO)) {
251 pr_err("invalid fan state %d requested, setting to auto!\n", 250 pr_err("invalid fan state %d requested, setting to auto!\n",
252 state); 251 state);
253 state = ACERHDF_FAN_AUTO; 252 state = ACERHDF_FAN_AUTO;
254 } 253 }
255 254
@@ -264,19 +263,18 @@ static void acerhdf_check_param(struct thermal_zone_device *thermal)
264{ 263{
265 if (fanon > ACERHDF_MAX_FANON) { 264 if (fanon > ACERHDF_MAX_FANON) {
266 pr_err("fanon temperature too high, set to %d\n", 265 pr_err("fanon temperature too high, set to %d\n",
267 ACERHDF_MAX_FANON); 266 ACERHDF_MAX_FANON);
268 fanon = ACERHDF_MAX_FANON; 267 fanon = ACERHDF_MAX_FANON;
269 } 268 }
270 269
271 if (kernelmode && prev_interval != interval) { 270 if (kernelmode && prev_interval != interval) {
272 if (interval > ACERHDF_MAX_INTERVAL) { 271 if (interval > ACERHDF_MAX_INTERVAL) {
273 pr_err("interval too high, set to %d\n", 272 pr_err("interval too high, set to %d\n",
274 ACERHDF_MAX_INTERVAL); 273 ACERHDF_MAX_INTERVAL);
275 interval = ACERHDF_MAX_INTERVAL; 274 interval = ACERHDF_MAX_INTERVAL;
276 } 275 }
277 if (verbose) 276 if (verbose)
278 pr_notice("interval changed to: %d\n", 277 pr_notice("interval changed to: %d\n", interval);
279 interval);
280 thermal->polling_delay = interval*1000; 278 thermal->polling_delay = interval*1000;
281 prev_interval = interval; 279 prev_interval = interval;
282 } 280 }
@@ -587,8 +585,8 @@ static int acerhdf_check_hardware(void)
587 } 585 }
588 586
589 if (!bios_cfg) { 587 if (!bios_cfg) {
590 pr_err("unknown (unsupported) BIOS version %s/%s/%s, " 588 pr_err("unknown (unsupported) BIOS version %s/%s/%s, please report, aborting!\n",
591 "please report, aborting!\n", vendor, product, version); 589 vendor, product, version);
592 return -EINVAL; 590 return -EINVAL;
593 } 591 }
594 592
@@ -598,8 +596,7 @@ static int acerhdf_check_hardware(void)
598 */ 596 */
599 if (!kernelmode) { 597 if (!kernelmode) {
600 pr_notice("Fan control off, to enable do:\n"); 598 pr_notice("Fan control off, to enable do:\n");
601 pr_notice("echo -n \"enabled\" > " 599 pr_notice("echo -n \"enabled\" > /sys/class/thermal/thermal_zone0/mode\n");
602 "/sys/class/thermal/thermal_zone0/mode\n");
603 } 600 }
604 601
605 return 0; 602 return 0;