Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296974
b: refs/heads/master
c: 6e71f38
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Matthew Garrett committed Mar 20, 2012
1 parent 10a9834 commit ce33a53
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 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: 92304a4084911cf1eef1cd624f6bf6f207498847
refs/heads/master: 6e71f38bdac9e7e3d598fdfe31020cdaa18b20d5
29 changes: 14 additions & 15 deletions trunk/drivers/platform/x86/acer-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ static acpi_status wmid3_set_device_status(u32 value, u16 device)
return AE_ERROR;
}
if (obj->buffer.length != 8) {
pr_warning("Unknown buffer length %d\n", obj->buffer.length);
pr_warn("Unknown buffer length %d\n", obj->buffer.length);
kfree(obj);
return AE_ERROR;
}
Expand All @@ -1015,8 +1015,8 @@ static acpi_status wmid3_set_device_status(u32 value, u16 device)
kfree(obj);

if (return_value.error_code || return_value.ec_return_value) {
pr_warning("Get Current Device Status failed: "
"0x%x - 0x%x\n", return_value.error_code,
pr_warn("Get Current Device Status failed: 0x%x - 0x%x\n",
return_value.error_code,
return_value.ec_return_value);
return status;
}
Expand All @@ -1039,7 +1039,7 @@ static acpi_status wmid3_set_device_status(u32 value, u16 device)
return AE_ERROR;
}
if (obj->buffer.length != 4) {
pr_warning("Unknown buffer length %d\n", obj->buffer.length);
pr_warn("Unknown buffer length %d\n", obj->buffer.length);
kfree(obj);
return AE_ERROR;
}
Expand All @@ -1048,8 +1048,8 @@ static acpi_status wmid3_set_device_status(u32 value, u16 device)
kfree(obj);

if (return_value.error_code || return_value.ec_return_value)
pr_warning("Set Device Status failed: "
"0x%x - 0x%x\n", return_value.error_code,
pr_warn("Set Device Status failed: 0x%x - 0x%x\n",
return_value.error_code,
return_value.ec_return_value);

return status;
Expand Down Expand Up @@ -1488,8 +1488,8 @@ static ssize_t show_bool_threeg(struct device *dev,
u32 result; \
acpi_status status;

pr_info("This threeg sysfs will be removed in 2012"
" - used by: %s\n", current->comm);
pr_info("This threeg sysfs will be removed in 2012 - used by: %s\n",
current->comm);
status = get_u32(&result, ACER_CAP_THREEG);
if (ACPI_SUCCESS(status))
return sprintf(buf, "%u\n", result);
Expand All @@ -1501,8 +1501,8 @@ static ssize_t set_bool_threeg(struct device *dev,
{
u32 tmp = simple_strtoul(buf, NULL, 10);
acpi_status status = set_u32(tmp, ACER_CAP_THREEG);
pr_info("This threeg sysfs will be removed in 2012"
" - used by: %s\n", current->comm);
pr_info("This threeg sysfs will be removed in 2012 - used by: %s\n",
current->comm);
if (ACPI_FAILURE(status))
return -EINVAL;
return count;
Expand All @@ -1513,8 +1513,8 @@ static DEVICE_ATTR(threeg, S_IRUGO | S_IWUSR, show_bool_threeg,
static ssize_t show_interface(struct device *dev, struct device_attribute *attr,
char *buf)
{
pr_info("This interface sysfs will be removed in 2012"
" - used by: %s\n", current->comm);
pr_info("This interface sysfs will be removed in 2012 - used by: %s\n",
current->comm);
switch (interface->type) {
case ACER_AMW0:
return sprintf(buf, "AMW0\n");
Expand Down Expand Up @@ -1982,8 +1982,7 @@ static int __init acer_wmi_init(void)

if (acpi_video_backlight_support()) {
interface->capability &= ~ACER_CAP_BRIGHTNESS;
pr_info("Brightness must be controlled by "
"generic video driver\n");
pr_info("Brightness must be controlled by generic video driver\n");
}

if (wmi_has_guid(WMID_GUID3)) {
Expand All @@ -2008,7 +2007,7 @@ static int __init acer_wmi_init(void)

err = platform_driver_register(&acer_platform_driver);
if (err) {
pr_err("Unable to register platform driver.\n");
pr_err("Unable to register platform driver\n");
goto error_platform_register;
}

Expand Down

0 comments on commit ce33a53

Please sign in to comment.