Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / input / input-polldev.c

diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
index 10c9b0a845f07abb41b0d071133d9166e601c763..0559e309bac9a443230e66d3f3cfff31e7963f0b 100644 (file)
--- 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;
                }