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

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

diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 2a00ddf4f23a3b469c621be77b08c4d6b943c428..7630273e9474051c3ba4886012e61f1088b43a81 100644 (file)
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -9,6 +9,8 @@
  * the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define MOUSEDEV_MINOR_BASE    32
 #define MOUSEDEV_MINORS                32
 #define MOUSEDEV_MIX           31
@@ -977,7 +979,7 @@ static int mousedev_connect(struct input_handler *handler,
                        break;
 
        if (minor == MOUSEDEV_MINORS) {
-               printk(KERN_ERR "mousedev: no more free mousedev devices\n");
+               pr_err("no more free mousedev devices\n");
                return -ENFILE;
        }
 
@@ -1087,13 +1089,13 @@ static int __init mousedev_init(void)
 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
        error = misc_register(&psaux_mouse);
        if (error)
-               printk(KERN_WARNING "mice: could not register psaux device, "
-                       "error: %d\n", error);
+               pr_warning("could not register psaux device, error: %d\n",
+                          error);
        else
                psaux_registered = 1;
 #endif
 
-       printk(KERN_INFO "mice: PS/2 mouse device common for all mice\n");
+       pr_info("PS/2 mouse device common for all mice\n");
 
        return 0;
 }