Commit 2afebafd authored by Oliver Neukum's avatar Oliver Neukum Committed by Dmitry Torokhov
Browse files

Input: ff-core - use new debug macros 



Replace old pr_* with dev_* debugging macros

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 8b8be51b

drivers/input/ff-core.c

+4 −6
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 


/* #define DEBUG */



#define pr_fmt(fmt) KBUILD_BASENAME ": " fmt



#include <linux/input.h>

#include <linux/module.h>

#include <linux/mutex.h>
@@ -116,7 +114,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)) {

		pr_debug("invalid or not supported effect type in upload\n");

		dev_dbg(&dev->dev, "invalid or not supported effect type in upload\n");

		return -EINVAL;

	}
@@ -124,7 +122,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))) {

		pr_debug("invalid or not supported wave form in upload\n");

		dev_dbg(&dev->dev, "invalid or not supported wave form in upload\n");

		return -EINVAL;

	}
@@ -246,7 +244,7 @@ static int flush_effects(struct input_dev *dev, struct file *file) 
	struct ff_device *ff = dev->ff;

	int i;



	pr_debug("flushing now\n");

	dev_dbg(&dev->dev, "flushing now\n");



	mutex_lock(&ff->mutex);
@@ -316,7 +314,7 @@ int input_ff_create(struct input_dev *dev, unsigned int max_effects) 
	int i;



	if (!max_effects) {

		pr_err("cannot allocate device without any effects\n");

		dev_err(&dev->dev, "cannot allocate device without any effects\n");

		return -EINVAL;

	}