Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2012-05-02 00:13:38 -07:00
parent a882c932a6
commit eb71d1bb27
2 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/input/tablet/wacom_sys.c
View file

@ -522,7 +522,8 @@ static int wacom_retrieve_hid_descriptor(struct usb_interface *intf,
error = usb_get_extra_descriptor(&interface->endpoint[0], error = usb_get_extra_descriptor(&interface->endpoint[0],
HID_DEVICET_REPORT, &hid_desc); HID_DEVICET_REPORT, &hid_desc);
if (error) { if (error) {
printk(KERN_ERR "wacom: can not retrieve extra class descriptor\n"); dev_err(&intf->dev,
"can not retrieve extra class descriptor\n");
goto out; goto out;
} }
} }
@ -1040,13 +1041,13 @@ static void wacom_wireless_work(struct work_struct *work)
wacom->wacom_wac.input = NULL; wacom->wacom_wac.input = NULL;
if (wacom_wac->pid == 0) { if (wacom_wac->pid == 0) {
printk(KERN_INFO "wacom: wireless tablet disconnected\n"); dev_info(&wacom->intf->dev, "wireless tablet disconnected\n");
} else { } else {
const struct usb_device_id *id = wacom_ids; const struct usb_device_id *id = wacom_ids;
printk(KERN_INFO dev_info(&wacom->intf->dev,
"wacom: wireless tablet connected with PID %x\n", "wireless tablet connected with PID %x\n",
wacom_wac->pid); wacom_wac->pid);
while (id->match_flags) { while (id->match_flags) {
if (id->idVendor == USB_VENDOR_ID_WACOM && if (id->idVendor == USB_VENDOR_ID_WACOM &&
@ -1056,8 +1057,8 @@ static void wacom_wireless_work(struct work_struct *work)
} }
if (!id->match_flags) { if (!id->match_flags) {
printk(KERN_INFO dev_info(&wacom->intf->dev,
"wacom: ignorning unknown PID.\n"); "ignoring unknown PID.\n");
return; return;
} }

29
drivers/input/tablet/wacom_wac.c
View file

@ -61,7 +61,8 @@ static int wacom_penpartner_irq(struct wacom_wac *wacom)
break; break;
default: default:
printk(KERN_INFO "wacom_penpartner_irq: received unknown report #%d\n", data[0]); dev_dbg(input->dev.parent,
"%s: received unknown report #%d\n", __func__, data[0]);
return 0; return 0;
} }
@ -76,7 +77,8 @@ static int wacom_pl_irq(struct wacom_wac *wacom)
int prox, pressure; int prox, pressure;
if (data[0] != WACOM_REPORT_PENABLED) { if (data[0] != WACOM_REPORT_PENABLED) {
dbg("wacom_pl_irq: received unknown report #%d", data[0]); dev_dbg(input->dev.parent,
"%s: received unknown report #%d\n", __func__, data[0]);
return 0; return 0;
} }
@ -146,7 +148,8 @@ static int wacom_ptu_irq(struct wacom_wac *wacom)
struct input_dev *input = wacom->input; struct input_dev *input = wacom->input;
if (data[0] != WACOM_REPORT_PENABLED) { if (data[0] != WACOM_REPORT_PENABLED) {
printk(KERN_INFO "wacom_ptu_irq: received unknown report #%d\n", data[0]); dev_dbg(input->dev.parent,
"%s: received unknown report #%d\n", __func__, data[0]);
return 0; return 0;
} }
@ -175,7 +178,8 @@ static int wacom_dtu_irq(struct wacom_wac *wacom)
struct input_dev *input = wacom->input; struct input_dev *input = wacom->input;
int prox = data[1] & 0x20, pressure; int prox = data[1] & 0x20, pressure;
dbg("wacom_dtu_irq: received report #%d", data[0]); dev_dbg(input->dev.parent,
"%s: received report #%d", __func__, data[0]);
if (prox) { if (prox) {
/* Going into proximity select tool */ /* Going into proximity select tool */
@ -211,7 +215,8 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
int retval = 0; int retval = 0;
if (data[0] != WACOM_REPORT_PENABLED) { if (data[0] != WACOM_REPORT_PENABLED) {
dbg("wacom_graphire_irq: received unknown report #%d", data[0]); dev_dbg(input->dev.parent,
"%s: received unknown report #%d\n", __func__, data[0]);
goto exit; goto exit;
} }
@ -489,10 +494,13 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
unsigned int t; unsigned int t;
int idx = 0, result; int idx = 0, result;
if (data[0] != WACOM_REPORT_PENABLED && data[0] != WACOM_REPORT_INTUOSREAD if (data[0] != WACOM_REPORT_PENABLED &&
&& data[0] != WACOM_REPORT_INTUOSWRITE && data[0] != WACOM_REPORT_INTUOSPAD data[0] != WACOM_REPORT_INTUOSREAD &&
&& data[0] != WACOM_REPORT_INTUOS5PAD) { data[0] != WACOM_REPORT_INTUOSWRITE &&
dbg("wacom_intuos_irq: received unknown report #%d", data[0]); data[0] != WACOM_REPORT_INTUOSPAD &&
data[0] != WACOM_REPORT_INTUOS5PAD) {
dev_dbg(input->dev.parent,
"%s: received unknown report #%d\n", __func__, data[0]);
return 0; return 0;
} }
@ -938,7 +946,8 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
{ {
char *data = wacom->data; char *data = wacom->data;
dbg("wacom_tpc_irq: received report #%d", data[0]); dev_dbg(wacom->input->dev.parent,
"%s: received report #%d\n", __func__, data[0]);
switch (len) { switch (len) {
case WACOM_PKGLEN_TPC1FG: case WACOM_PKGLEN_TPC1FG: