diff options
author | Matthew Garrett <mjg@redhat.com> | 2011-05-29 14:27:13 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2011-05-29 14:27:13 -0400 |
commit | 437cb0dbd104a1564e0e78f0d486b97677f80909 (patch) | |
tree | e066b3d65eb965ca68ecc8ef14581f2450ad3a61 /drivers/platform/x86/xo15-ebook.c | |
parent | 139f37f5e14cd883eee2a8a36289f544b5390a44 (diff) | |
parent | 987dfbaa65b2c3568b85e29d2598da08a011ee09 (diff) |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'drivers/platform/x86/xo15-ebook.c')
-rw-r--r-- | drivers/platform/x86/xo15-ebook.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/platform/x86/xo15-ebook.c b/drivers/platform/x86/xo15-ebook.c index c1372ed9d2e9..fad153dc0355 100644 --- a/drivers/platform/x86/xo15-ebook.c +++ b/drivers/platform/x86/xo15-ebook.c @@ -11,6 +11,8 @@ * your option) any later version. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> @@ -20,7 +22,6 @@ #include <acpi/acpi_drivers.h> #define MODULE_NAME "xo15-ebook" -#define PREFIX MODULE_NAME ": " #define XO15_EBOOK_CLASS MODULE_NAME #define XO15_EBOOK_TYPE_UNKNOWN 0x00 @@ -105,7 +106,7 @@ static int ebook_switch_add(struct acpi_device *device) class = acpi_device_class(device); if (strcmp(hid, XO15_EBOOK_HID)) { - printk(KERN_ERR PREFIX "Unsupported hid [%s]\n", hid); + pr_err("Unsupported hid [%s]\n", hid); error = -ENODEV; goto err_free_input; } |