diff options
author | Joe Perches <joe@perches.com> | 2011-03-29 18:21:34 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2011-05-27 12:35:45 -0400 |
commit | 249c720d88fa325522cb763dda09f8c9e8e964cb (patch) | |
tree | a48f3da9f4190e7175a7871944693f864c5f275c | |
parent | 3a35125f97be0658305c9509c51077959c19b244 (diff) |
acer-wmi: pr_<level> cleanups
Convert pr_warning to pr_warn.
Add some missing newlines to pr_<level> uses.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
-rw-r--r-- | drivers/platform/x86/acer-wmi.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index ac4e7f83ce6c..fa8fa73f543e 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c | |||
@@ -1081,7 +1081,7 @@ static acpi_status wmid3_get_device_status(u32 *value, u16 device) | |||
1081 | return AE_ERROR; | 1081 | return AE_ERROR; |
1082 | } | 1082 | } |
1083 | if (obj->buffer.length != 8) { | 1083 | if (obj->buffer.length != 8) { |
1084 | pr_warning("Unknown buffer length %d\n", obj->buffer.length); | 1084 | pr_warn("Unknown buffer length %d\n", obj->buffer.length); |
1085 | kfree(obj); | 1085 | kfree(obj); |
1086 | return AE_ERROR; | 1086 | return AE_ERROR; |
1087 | } | 1087 | } |
@@ -1090,8 +1090,8 @@ static acpi_status wmid3_get_device_status(u32 *value, u16 device) | |||
1090 | kfree(obj); | 1090 | kfree(obj); |
1091 | 1091 | ||
1092 | if (return_value.error_code || return_value.ec_return_value) | 1092 | if (return_value.error_code || return_value.ec_return_value) |
1093 | pr_warning("Get Device Status failed: " | 1093 | pr_warn("Get Device Status failed: 0x%x - 0x%x\n", |
1094 | "0x%x - 0x%x\n", return_value.error_code, | 1094 | return_value.error_code, |
1095 | return_value.ec_return_value); | 1095 | return_value.ec_return_value); |
1096 | else | 1096 | else |
1097 | *value = !!(return_value.devices & device); | 1097 | *value = !!(return_value.devices & device); |
@@ -1317,7 +1317,7 @@ static void acer_wmi_notify(u32 value, void *context) | |||
1317 | 1317 | ||
1318 | status = wmi_get_event_data(value, &response); | 1318 | status = wmi_get_event_data(value, &response); |
1319 | if (status != AE_OK) { | 1319 | if (status != AE_OK) { |
1320 | pr_warning("bad event status 0x%x\n", status); | 1320 | pr_warn("bad event status 0x%x\n", status); |
1321 | return; | 1321 | return; |
1322 | } | 1322 | } |
1323 | 1323 | ||
@@ -1326,12 +1326,12 @@ static void acer_wmi_notify(u32 value, void *context) | |||
1326 | if (!obj) | 1326 | if (!obj) |
1327 | return; | 1327 | return; |
1328 | if (obj->type != ACPI_TYPE_BUFFER) { | 1328 | if (obj->type != ACPI_TYPE_BUFFER) { |
1329 | pr_warning("Unknown response received %d\n", obj->type); | 1329 | pr_warn("Unknown response received %d\n", obj->type); |
1330 | kfree(obj); | 1330 | kfree(obj); |
1331 | return; | 1331 | return; |
1332 | } | 1332 | } |
1333 | if (obj->buffer.length != 8) { | 1333 | if (obj->buffer.length != 8) { |
1334 | pr_warning("Unknown buffer length %d\n", obj->buffer.length); | 1334 | pr_warn("Unknown buffer length %d\n", obj->buffer.length); |
1335 | kfree(obj); | 1335 | kfree(obj); |
1336 | return; | 1336 | return; |
1337 | } | 1337 | } |
@@ -1356,11 +1356,11 @@ static void acer_wmi_notify(u32 value, void *context) | |||
1356 | } | 1356 | } |
1357 | if (!sparse_keymap_report_event(acer_wmi_input_dev, | 1357 | if (!sparse_keymap_report_event(acer_wmi_input_dev, |
1358 | return_value.key_num, 1, true)) | 1358 | return_value.key_num, 1, true)) |
1359 | pr_warning("Unknown key number - 0x%x\n", | 1359 | pr_warn("Unknown key number - 0x%x\n", |
1360 | return_value.key_num); | 1360 | return_value.key_num); |
1361 | break; | 1361 | break; |
1362 | default: | 1362 | default: |
1363 | pr_warning("Unknown function number - %d - %d\n", | 1363 | pr_warn("Unknown function number - %d - %d\n", |
1364 | return_value.function, return_value.key_num); | 1364 | return_value.function, return_value.key_num); |
1365 | break; | 1365 | break; |
1366 | } | 1366 | } |
@@ -1389,7 +1389,7 @@ wmid3_set_lm_mode(struct lm_input_params *params, | |||
1389 | return AE_ERROR; | 1389 | return AE_ERROR; |
1390 | } | 1390 | } |
1391 | if (obj->buffer.length != 4) { | 1391 | if (obj->buffer.length != 4) { |
1392 | pr_warning("Unknown buffer length %d\n", obj->buffer.length); | 1392 | pr_warn("Unknown buffer length %d\n", obj->buffer.length); |
1393 | kfree(obj); | 1393 | kfree(obj); |
1394 | return AE_ERROR; | 1394 | return AE_ERROR; |
1395 | } | 1395 | } |
@@ -1414,11 +1414,11 @@ static int acer_wmi_enable_ec_raw(void) | |||
1414 | status = wmid3_set_lm_mode(¶ms, &return_value); | 1414 | status = wmid3_set_lm_mode(¶ms, &return_value); |
1415 | 1415 | ||
1416 | if (return_value.error_code || return_value.ec_return_value) | 1416 | if (return_value.error_code || return_value.ec_return_value) |
1417 | pr_warning("Enabling EC raw mode failed: " | 1417 | pr_warn("Enabling EC raw mode failed: 0x%x - 0x%x\n", |
1418 | "0x%x - 0x%x\n", return_value.error_code, | 1418 | return_value.error_code, |
1419 | return_value.ec_return_value); | 1419 | return_value.ec_return_value); |
1420 | else | 1420 | else |
1421 | pr_info("Enabled EC raw mode"); | 1421 | pr_info("Enabled EC raw mode\n"); |
1422 | 1422 | ||
1423 | return status; | 1423 | return status; |
1424 | } | 1424 | } |
@@ -1437,9 +1437,9 @@ static int acer_wmi_enable_lm(void) | |||
1437 | status = wmid3_set_lm_mode(¶ms, &return_value); | 1437 | status = wmid3_set_lm_mode(¶ms, &return_value); |
1438 | 1438 | ||
1439 | if (return_value.error_code || return_value.ec_return_value) | 1439 | if (return_value.error_code || return_value.ec_return_value) |
1440 | pr_warning("Enabling Launch Manager failed: " | 1440 | pr_warn("Enabling Launch Manager failed: 0x%x - 0x%x\n", |
1441 | "0x%x - 0x%x\n", return_value.error_code, | 1441 | return_value.error_code, |
1442 | return_value.ec_return_value); | 1442 | return_value.ec_return_value); |
1443 | 1443 | ||
1444 | return status; | 1444 | return status; |
1445 | } | 1445 | } |