Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

+10 -13
+10 -13
drivers/input/joystick/walkera0701.c
··· 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 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++) { ··· 103 102 val8 = (w->buf[18] & 1) << 8 | (w->buf[19] << 4) | w->buf[20]; 104 103 val8 *= (w->buf[18] & 2) - 1; /*sign */ 105 104 106 - #ifdef WK0701_DEBUG 107 - { 108 - int magic, magic_bit; 109 - magic = (w->buf[21] << 4) | w->buf[22]; 110 - magic_bit = (w->buf[24] & 8) >> 3; 111 - printk(KERN_DEBUG 112 - "walkera0701: %4d %4d %4d %4d %4d %4d %4d %4d (magic %2x %d)\n", 113 - val1, val2, val3, val4, val5, val6, val7, val8, magic, 114 - magic_bit); 115 - } 116 - #endif 105 + magic = (w->buf[21] << 4) | w->buf[22]; 106 + magic_bit = (w->buf[24] & 8) >> 3; 107 + pr_debug("%4d %4d %4d %4d %4d %4d %4d %4d (magic %2x %d)\n", 108 + val1, val2, val3, val4, val5, val6, val7, val8, 109 + magic, magic_bit); 110 + 117 111 input_report_abs(w->input_dev, ABS_X, val2); 118 112 input_report_abs(w->input_dev, ABS_Y, val1); 119 113 input_report_abs(w->input_dev, ABS_Z, val6); ··· 204 208 return -ENODEV; 205 209 206 210 if (w->parport->irq == -1) { 207 - printk(KERN_ERR "walkera0701: parport without interrupt\n"); 211 + pr_err("parport %d does not have interrupt assigned\n", 212 + parport); 208 213 goto init_err; 209 214 } 210 215