|
@@ -25,6 +25,8 @@
|
|
|
|
|
|
#define QUICKSTART_VERSION "1.03"
|
|
|
|
|
|
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
+
|
|
|
#include <linux/kernel.h>
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/init.h>
|
|
@@ -166,6 +168,7 @@ static void quickstart_acpi_notify(acpi_handle handle, u32 event, void *data)
|
|
|
input_sync(quickstart_input);
|
|
|
break;
|
|
|
default:
|
|
|
+ pr_err("Unexpected ACPI event notify (%u)\n", event);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -183,8 +186,7 @@ static int quickstart_acpi_ghid(struct quickstart_acpi *quickstart)
|
|
|
status = acpi_evaluate_object(quickstart->device->handle, "GHID", NULL,
|
|
|
&buffer);
|
|
|
if (ACPI_FAILURE(status)) {
|
|
|
- printk(KERN_ERR "quickstart: %s GHID method failed.\n",
|
|
|
- quickstart->button->name);
|
|
|
+ pr_err("%s GHID method failed\n", quickstart->button->name);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
@@ -207,8 +209,7 @@ static int quickstart_acpi_ghid(struct quickstart_acpi *quickstart)
|
|
|
quickstart->button->id = *(uint64_t *)buffer.pointer;
|
|
|
break;
|
|
|
default:
|
|
|
- printk(KERN_ERR "quickstart: %s GHID method returned buffer "
|
|
|
- "of unexpected length %u\n",
|
|
|
+ pr_err("%s GHID method returned buffer of unexpected length %u\n",
|
|
|
quickstart->button->name, buffer.length);
|
|
|
ret = -EINVAL;
|
|
|
break;
|
|
@@ -269,7 +270,7 @@ static int quickstart_acpi_add(struct acpi_device *device)
|
|
|
quickstart_acpi_notify,
|
|
|
quickstart);
|
|
|
if (ACPI_FAILURE(status)) {
|
|
|
- printk(KERN_ERR "quickstart: Notify handler install error\n");
|
|
|
+ pr_err("Notify handler install error\n");
|
|
|
ret = -ENODEV;
|
|
|
goto fail_installnotify;
|
|
|
}
|
|
@@ -309,7 +310,7 @@ static int quickstart_acpi_remove(struct acpi_device *device, int type)
|
|
|
status = acpi_remove_notify_handler(device->handle, ACPI_ALL_NOTIFY,
|
|
|
quickstart_acpi_notify);
|
|
|
if (ACPI_FAILURE(status))
|
|
|
- printk(KERN_ERR "quickstart: Error removing notify handler\n");
|
|
|
+ pr_err("Error removing notify handler\n");
|
|
|
|
|
|
kfree(quickstart);
|
|
|
|
|
@@ -435,8 +436,7 @@ static int __init quickstart_init(void)
|
|
|
if (ret)
|
|
|
goto fail_input;
|
|
|
|
|
|
- printk(KERN_INFO "quickstart: ACPI Direct App Launch ver %s\n",
|
|
|
- QUICKSTART_VERSION);
|
|
|
+ pr_info("ACPI Direct App Launch ver %s\n", QUICKSTART_VERSION);
|
|
|
|
|
|
return 0;
|
|
|
fail_input:
|