diff options
| author | Szymon Janc <szymon@janc.net.pl> | 2012-01-22 19:50:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-09 09:41:33 -0800 |
| commit | 74eabe4ca2f6cf0e7e60e73017206e963f6b170a (patch) | |
| tree | de678661491fbae31738ec25b514757c5eab57b7 /drivers/staging/quickstart | |
| parent | 451196a338c681a95a79469cd58a54e657904e06 (diff) | |
| download | linux-74eabe4ca2f6cf0e7e60e73017206e963f6b170a.tar.gz linux-74eabe4ca2f6cf0e7e60e73017206e963f6b170a.tar.xz linux-74eabe4ca2f6cf0e7e60e73017206e963f6b170a.zip | |
Staging: quickstart: Use pr_err and pr_info for logs
Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/quickstart')
| -rw-r--r-- | drivers/staging/quickstart/quickstart.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c index a67b03a59955..88f8ff38662d 100644 --- a/drivers/staging/quickstart/quickstart.c +++ b/drivers/staging/quickstart/quickstart.c @@ -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: |