Input: use pr_fmt and pr_<level>

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c
index 03078c08309a..3367f760d75a 100644
--- a/drivers/input/ff-core.c
+++ b/drivers/input/ff-core.c
@@ -23,7 +23,7 @@
 
 /* #define DEBUG */
 
-#define debug(format, arg...) pr_debug("ff-core: " format "\n", ## arg)
+#define pr_fmt(fmt) KBUILD_BASENAME ": " fmt
 
 #include <linux/input.h>
 #include <linux/module.h>
@@ -116,7 +116,7 @@ int input_ff_upload(struct input_dev *dev, struct ff_effect *effect,
 
         if (effect->type < FF_EFFECT_MIN || effect->type > FF_EFFECT_MAX ||
             !test_bit(effect->type, dev->ffbit)) {
-                debug("invalid or not supported effect type in upload");
+                pr_debug("invalid or not supported effect type in upload\n");
                 return -EINVAL;
         }
 
@@ -124,7 +124,7 @@ int input_ff_upload(struct input_dev *dev, struct ff_effect *effect,
             (effect->u.periodic.waveform < FF_WAVEFORM_MIN ||
              effect->u.periodic.waveform > FF_WAVEFORM_MAX ||
              !test_bit(effect->u.periodic.waveform, dev->ffbit))) {
-                debug("invalid or not supported wave form in upload");
+                pr_debug("invalid or not supported wave form in upload\n");
                 return -EINVAL;
         }
 
@@ -246,7 +246,7 @@ static int flush_effects(struct input_dev *dev, struct file *file)
         struct ff_device *ff = dev->ff;
         int i;
 
-        debug("flushing now");
+        pr_debug("flushing now\n");
 
         mutex_lock(&ff->mutex);
 
@@ -315,8 +315,7 @@ int input_ff_create(struct input_dev *dev, int max_effects)
         int i;
 
         if (!max_effects) {
-                printk(KERN_ERR
-                       "ff-core: cannot allocate device without any effects\n");
+                pr_err("cannot allocate device without any effects\n");
                 return -EINVAL;
         }