diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-06 22:34:59 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-06 22:34:59 -0800 |
| commit | 554738da71004d96e06fb75f4772dfc3b0f47810 (patch) | |
| tree | 149a96ce3727025d3b9260961ec94ba8306db278 /drivers/input/input-polldev.c | |
| parent | 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 (diff) | |
| parent | a6d38f889750ed6290728a19d9dad577b147c6d0 (diff) | |
| download | cachepc-linux-554738da71004d96e06fb75f4772dfc3b0f47810.tar.gz cachepc-linux-554738da71004d96e06fb75f4772dfc3b0f47810.zip | |
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
Diffstat (limited to 'drivers/input/input-polldev.c')
| -rw-r--r-- | drivers/input/input-polldev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c index 10c9b0a845f0..0559e309bac9 100644 --- a/drivers/input/input-polldev.c +++ b/drivers/input/input-polldev.c @@ -8,6 +8,8 @@ * the Free Software Foundation. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/jiffies.h> #include <linux/slab.h> #include <linux/mutex.h> @@ -33,8 +35,7 @@ static int input_polldev_start_workqueue(void) if (!polldev_users) { polldev_wq = create_singlethread_workqueue("ipolldevd"); if (!polldev_wq) { - printk(KERN_ERR "input-polldev: failed to create " - "ipolldevd workqueue\n"); + pr_err("failed to create ipolldevd workqueue\n"); retval = -ENOMEM; goto out; } |