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

Input: wacom - use dev_xxx() instead of naked printk()s and dbg()s

Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Dmitry Torokhov eb71d1bb a882c932

+27 -17
+8 -7
drivers/input/tablet/wacom_sys.c
··· 522 522 error = usb_get_extra_descriptor(&interface->endpoint[0], 523 523 HID_DEVICET_REPORT, &hid_desc); 524 524 if (error) { 525 - printk(KERN_ERR "wacom: can not retrieve extra class descriptor\n"); 525 + dev_err(&intf->dev, 526 + "can not retrieve extra class descriptor\n"); 526 527 goto out; 527 528 } 528 529 } ··· 1041 1040 wacom->wacom_wac.input = NULL; 1042 1041 1043 1042 if (wacom_wac->pid == 0) { 1044 - printk(KERN_INFO "wacom: wireless tablet disconnected\n"); 1043 + dev_info(&wacom->intf->dev, "wireless tablet disconnected\n"); 1045 1044 } else { 1046 1045 const struct usb_device_id *id = wacom_ids; 1047 1046 1048 - printk(KERN_INFO 1049 - "wacom: wireless tablet connected with PID %x\n", 1050 - wacom_wac->pid); 1047 + dev_info(&wacom->intf->dev, 1048 + "wireless tablet connected with PID %x\n", 1049 + wacom_wac->pid); 1051 1050 1052 1051 while (id->match_flags) { 1053 1052 if (id->idVendor == USB_VENDOR_ID_WACOM && ··· 1057 1056 } 1058 1057 1059 1058 if (!id->match_flags) { 1060 - printk(KERN_INFO 1061 - "wacom: ignorning unknown PID.\n"); 1059 + dev_info(&wacom->intf->dev, 1060 + "ignoring unknown PID.\n"); 1062 1061 return; 1063 1062 } 1064 1063
+19 -10
drivers/input/tablet/wacom_wac.c
··· 61 61 break; 62 62 63 63 default: 64 - printk(KERN_INFO "wacom_penpartner_irq: received unknown report #%d\n", data[0]); 64 + dev_dbg(input->dev.parent, 65 + "%s: received unknown report #%d\n", __func__, data[0]); 65 66 return 0; 66 67 } 67 68 ··· 77 76 int prox, pressure; 78 77 79 78 if (data[0] != WACOM_REPORT_PENABLED) { 80 - dbg("wacom_pl_irq: received unknown report #%d", data[0]); 79 + dev_dbg(input->dev.parent, 80 + "%s: received unknown report #%d\n", __func__, data[0]); 81 81 return 0; 82 82 } 83 83 ··· 148 146 struct input_dev *input = wacom->input; 149 147 150 148 if (data[0] != WACOM_REPORT_PENABLED) { 151 - printk(KERN_INFO "wacom_ptu_irq: received unknown report #%d\n", data[0]); 149 + dev_dbg(input->dev.parent, 150 + "%s: received unknown report #%d\n", __func__, data[0]); 152 151 return 0; 153 152 } 154 153 ··· 178 175 struct input_dev *input = wacom->input; 179 176 int prox = data[1] & 0x20, pressure; 180 177 181 - dbg("wacom_dtu_irq: received report #%d", data[0]); 178 + dev_dbg(input->dev.parent, 179 + "%s: received report #%d", __func__, data[0]); 182 180 183 181 if (prox) { 184 182 /* Going into proximity select tool */ ··· 215 211 int retval = 0; 216 212 217 213 if (data[0] != WACOM_REPORT_PENABLED) { 218 - dbg("wacom_graphire_irq: received unknown report #%d", data[0]); 214 + dev_dbg(input->dev.parent, 215 + "%s: received unknown report #%d\n", __func__, data[0]); 219 216 goto exit; 220 217 } 221 218 ··· 494 489 unsigned int t; 495 490 int idx = 0, result; 496 491 497 - if (data[0] != WACOM_REPORT_PENABLED && data[0] != WACOM_REPORT_INTUOSREAD 498 - && data[0] != WACOM_REPORT_INTUOSWRITE && data[0] != WACOM_REPORT_INTUOSPAD 499 - && data[0] != WACOM_REPORT_INTUOS5PAD) { 500 - dbg("wacom_intuos_irq: received unknown report #%d", data[0]); 492 + if (data[0] != WACOM_REPORT_PENABLED && 493 + data[0] != WACOM_REPORT_INTUOSREAD && 494 + data[0] != WACOM_REPORT_INTUOSWRITE && 495 + data[0] != WACOM_REPORT_INTUOSPAD && 496 + data[0] != WACOM_REPORT_INTUOS5PAD) { 497 + dev_dbg(input->dev.parent, 498 + "%s: received unknown report #%d\n", __func__, data[0]); 501 499 return 0; 502 500 } 503 501 ··· 946 938 { 947 939 char *data = wacom->data; 948 940 949 - dbg("wacom_tpc_irq: received report #%d", data[0]); 941 + dev_dbg(wacom->input->dev.parent, 942 + "%s: received report #%d\n", __func__, data[0]); 950 943 951 944 switch (len) { 952 945 case WACOM_PKGLEN_TPC1FG: