Input: walkera0701 - switch to using pr_xxx() for messages

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Input: walkera0701 - switch to using pr_xxx() for messages
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Dmitry Torokhov
1 parent 1932c8a003
Showing 1 changed file with 10 additions and 13 deletions Side-by-side Diff
drivers/input/joystick/walkera0701.c
@@ -12,7 +12,7 @@
  * the Free Software Foundation.
 */
  
-/* #define WK0701_DEBUG */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
 #define RESERVE 20000
 #define SYNC_PULSE 1306000
@@ -67,6 +67,7 @@
 {
 	int i;
 	int val1, val2, val3, val4, val5, val6, val7, val8;
+	int magic, magic_bit;
 	int crc1, crc2;
  
 	for (crc1 = crc2 = i = 0; i < 10; i++) {
@@ -102,17 +103,12 @@
 	val8 = (w->buf[18] & 1) << 8 | (w->buf[19] << 4) | w->buf[20];
 	val8 *= (w->buf[18] & 2) - 1;	/*sign */
  
-#ifdef WK0701_DEBUG
-	{
-		int magic, magic_bit;
-		magic = (w->buf[21] << 4) | w->buf[22];
-		magic_bit = (w->buf[24] & 8) >> 3;
-		printk(KERN_DEBUG
-		       "walkera0701: %4d %4d %4d %4d  %4d %4d %4d %4d (magic %2x %d)\n",
-		       val1, val2, val3, val4, val5, val6, val7, val8, magic,
-		       magic_bit);
-	}
-#endif
+	magic = (w->buf[21] << 4) | w->buf[22];
+	magic_bit = (w->buf[24] & 8) >> 3;
+	pr_debug("%4d %4d %4d %4d  %4d %4d %4d %4d (magic %2x %d)\n",
+		 val1, val2, val3, val4, val5, val6, val7, val8,
+		 magic, magic_bit);
+
 	input_report_abs(w->input_dev, ABS_X, val2);
 	input_report_abs(w->input_dev, ABS_Y, val1);
 	input_report_abs(w->input_dev, ABS_Z, val6);
@@ -208,7 +204,8 @@
 		return -ENODEV;
  
 	if (w->parport->irq == -1) {
-		printk(KERN_ERR "walkera0701: parport without interrupt\n");
+		pr_err("parport %d does not have interrupt assigned\n",
+			parport);
 		goto init_err;
 	}
...	...	@@ -12,7 +12,7 @@
12	12	* the Free Software Foundation.
13	13	*/
14	14
15		-/* #define WK0701_DEBUG */
	15	+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
16	16
17	17	#define RESERVE 20000
18	18	#define SYNC_PULSE 1306000
...	...	@@ -67,6 +67,7 @@
67	67	{
68	68	int i;
69	69	int val1, val2, val3, val4, val5, val6, val7, val8;
	70	+ int magic, magic_bit;
70	71	int crc1, crc2;
71	72
72	73	for (crc1 = crc2 = i = 0; i < 10; i++) {
...	...	@@ -102,17 +103,12 @@
102	103	val8 = (w->buf[18] & 1) << 8 \| (w->buf[19] << 4) \| w->buf[20];
103	104	val8 = (w->buf[18] & 2) - 1; /sign */
104	105
105		-#ifdef WK0701_DEBUG
106		- {
107		- int magic, magic_bit;
108		- magic = (w->buf[21] << 4) \| w->buf[22];
109		- magic_bit = (w->buf[24] & 8) >> 3;
110		- printk(KERN_DEBUG
111		- "walkera0701: %4d %4d %4d %4d %4d %4d %4d %4d (magic %2x %d)\n",
112		- val1, val2, val3, val4, val5, val6, val7, val8, magic,
113		- magic_bit);
114		- }
115		-#endif
	106	+ magic = (w->buf[21] << 4) \| w->buf[22];
	107	+ magic_bit = (w->buf[24] & 8) >> 3;
	108	+ pr_debug("%4d %4d %4d %4d %4d %4d %4d %4d (magic %2x %d)\n",
	109	+ val1, val2, val3, val4, val5, val6, val7, val8,
	110	+ magic, magic_bit);
	111	+
116	112	input_report_abs(w->input_dev, ABS_X, val2);
117	113	input_report_abs(w->input_dev, ABS_Y, val1);
118	114	input_report_abs(w->input_dev, ABS_Z, val6);
...	...	@@ -208,7 +204,8 @@
208	204	return -ENODEV;
209	205
210	206	if (w->parport->irq == -1) {
211		- printk(KERN_ERR "walkera0701: parport without interrupt\n");
	207	+ pr_err("parport %d does not have interrupt assigned\n",
	208	+ parport);
212	209	goto init_err;
213	210	}
214	211