diff options
| author | Dmitry Torokhov | 2011-01-07 07:34:59 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2011-01-07 07:34:59 +0100 |
| commit | 554738da71004d96e06fb75f4772dfc3b0f47810 (patch) | |
| tree | 149a96ce3727025d3b9260961ec94ba8306db278 /drivers/input/apm-power.c | |
| parent | Input: wacom - add support for digitizer in Lenovo W700 (diff) | |
| parent | Input: wacom_w8001 - support pen or touch only devices (diff) | |
| download | kernel-qcow2-linux-554738da71004d96e06fb75f4772dfc3b0f47810.tar.gz kernel-qcow2-linux-554738da71004d96e06fb75f4772dfc3b0f47810.tar.xz kernel-qcow2-linux-554738da71004d96e06fb75f4772dfc3b0f47810.zip | |
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
Diffstat (limited to 'drivers/input/apm-power.c')
| -rw-r--r-- | drivers/input/apm-power.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power.c index 7d61a9660806..e90ee3d30613 100644 --- a/drivers/input/apm-power.c +++ b/drivers/input/apm-power.c @@ -9,6 +9,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/module.h> #include <linux/input.h> #include <linux/slab.h> @@ -23,8 +25,7 @@ static void system_power_event(unsigned int keycode) switch (keycode) { case KEY_SUSPEND: apm_queue_event(APM_USER_SUSPEND); - - printk(KERN_INFO "apm-power: Requesting system suspend...\n"); + pr_info("Requesting system suspend...\n"); break; default: break; @@ -65,18 +66,15 @@ static int apmpower_connect(struct input_handler *handler, error = input_register_handle(handle); if (error) { - printk(KERN_ERR - "apm-power: Failed to register input power handler, " - "error %d\n", error); + pr_err("Failed to register input power handler, error %d\n", + error); kfree(handle); return error; } error = input_open_device(handle); if (error) { - printk(KERN_ERR - "apm-power: Failed to open input power device, " - "error %d\n", error); + pr_err("Failed to open input power device, error %d\n", error); input_unregister_handle(handle); kfree(handle); return error; |