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

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

diff --git a/drivers/input/evbug.c b/drivers/input/evbug.c
index f7c5c14ec12ad933d5613fc4ea8c7a93cfa796e7..cd4e6679d61a9e0a0a9f72f19a0ae2fcbdc186a8 100644 (file)
--- a/drivers/input/evbug.c
+++ b/drivers/input/evbug.c
@@ -26,6 +26,8 @@
  * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/input.h>
@@ -38,8 +40,8 @@ MODULE_LICENSE("GPL");
 
 static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
 {
-       printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n",
-               dev_name(&handle->dev->dev), type, code, value);
+       printk(KERN_DEBUG pr_fmt("Event. Dev: %s, Type: %d, Code: %d, Value: %d\n"),
+              dev_name(&handle->dev->dev), type, code, value);
 }
 
 static int evbug_connect(struct input_handler *handler, struct input_dev *dev,
@@ -64,10 +66,10 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev,
        if (error)
                goto err_unregister_handle;
 
-       printk(KERN_DEBUG "evbug.c: Connected device: %s (%s at %s)\n",
-               dev_name(&dev->dev),
-               dev->name ?: "unknown",
-               dev->phys ?: "unknown");
+       printk(KERN_DEBUG pr_fmt("Connected device: %s (%s at %s)\n"),
+              dev_name(&dev->dev),
+              dev->name ?: "unknown",
+              dev->phys ?: "unknown");
 
        return 0;
 
@@ -80,8 +82,8 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev,
 
 static void evbug_disconnect(struct input_handle *handle)
 {
-       printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n",
-               dev_name(&handle->dev->dev));
+       printk(KERN_DEBUG pr_fmt("Disconnected device: %s\n"),
+              dev_name(&handle->dev->dev));
 
        input_close_device(handle);
        input_unregister_handle(handle);