aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet/wacom_wac.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-02 03:13:38 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-02 03:20:51 -0400
commiteb71d1bb270ef6b2a9c1bfaa7818e1e75b3d4546 (patch)
tree6c28436c216c5f3d6a63a670c5778cbc7048c4a4 /drivers/input/tablet/wacom_wac.c
parenta882c932a628cbab17752fc8b1c94692f95bbf9a (diff)
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>
Diffstat (limited to 'drivers/input/tablet/wacom_wac.c')
-rw-r--r--drivers/input/tablet/wacom_wac.c29
1 files changed, 19 insertions, 10 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 10e5cf870359..004bc1bb1544 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -61,7 +61,8 @@ static int wacom_penpartner_irq(struct wacom_wac *wacom)
61 break; 61 break;
62 62
63 default: 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 return 0; 66 return 0;
66 } 67 }
67 68
@@ -76,7 +77,8 @@ static int wacom_pl_irq(struct wacom_wac *wacom)
76 int prox, pressure; 77 int prox, pressure;
77 78
78 if (data[0] != WACOM_REPORT_PENABLED) { 79 if (data[0] != WACOM_REPORT_PENABLED) {
79 dbg("wacom_pl_irq: received unknown report #%d", data[0]); 80 dev_dbg(input->dev.parent,
81 "%s: received unknown report #%d\n", __func__, data[0]);
80 return 0; 82 return 0;
81 } 83 }
82 84
@@ -146,7 +148,8 @@ static int wacom_ptu_irq(struct wacom_wac *wacom)
146 struct input_dev *input = wacom->input; 148 struct input_dev *input = wacom->input;
147 149
148 if (data[0] != WACOM_REPORT_PENABLED) { 150 if (data[0] != WACOM_REPORT_PENABLED) {
149 printk(KERN_INFO "wacom_ptu_irq: received unknown report #%d\n", data[0]); 151 dev_dbg(input->dev.parent,
152 "%s: received unknown report #%d\n", __func__, data[0]);
150 return 0; 153 return 0;
151 } 154 }
152 155
@@ -175,7 +178,8 @@ static int wacom_dtu_irq(struct wacom_wac *wacom)
175 struct input_dev *input = wacom->input; 178 struct input_dev *input = wacom->input;
176 int prox = data[1] & 0x20, pressure; 179 int prox = data[1] & 0x20, pressure;
177 180
178 dbg("wacom_dtu_irq: received report #%d", data[0]); 181 dev_dbg(input->dev.parent,
182 "%s: received report #%d", __func__, data[0]);
179 183
180 if (prox) { 184 if (prox) {
181 /* Going into proximity select tool */ 185 /* Going into proximity select tool */
@@ -211,7 +215,8 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
211 int retval = 0; 215 int retval = 0;
212 216
213 if (data[0] != WACOM_REPORT_PENABLED) { 217 if (data[0] != WACOM_REPORT_PENABLED) {
214 dbg("wacom_graphire_irq: received unknown report #%d", data[0]); 218 dev_dbg(input->dev.parent,
219 "%s: received unknown report #%d\n", __func__, data[0]);
215 goto exit; 220 goto exit;
216 } 221 }
217 222
@@ -489,10 +494,13 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
489 unsigned int t; 494 unsigned int t;
490 int idx = 0, result; 495 int idx = 0, result;
491 496
492 if (data[0] != WACOM_REPORT_PENABLED && data[0] != WACOM_REPORT_INTUOSREAD 497 if (data[0] != WACOM_REPORT_PENABLED &&
493 && data[0] != WACOM_REPORT_INTUOSWRITE && data[0] != WACOM_REPORT_INTUOSPAD 498 data[0] != WACOM_REPORT_INTUOSREAD &&
494 && data[0] != WACOM_REPORT_INTUOS5PAD) { 499 data[0] != WACOM_REPORT_INTUOSWRITE &&
495 dbg("wacom_intuos_irq: received unknown report #%d", data[0]); 500 data[0] != WACOM_REPORT_INTUOSPAD &&
501 data[0] != WACOM_REPORT_INTUOS5PAD) {
502 dev_dbg(input->dev.parent,
503 "%s: received unknown report #%d\n", __func__, data[0]);
496 return 0; 504 return 0;
497 } 505 }
498 506
@@ -938,7 +946,8 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
938{ 946{
939 char *data = wacom->data; 947 char *data = wacom->data;
940 948
941 dbg("wacom_tpc_irq: received report #%d", data[0]); 949 dev_dbg(wacom->input->dev.parent,
950 "%s: received report #%d\n", __func__, data[0]);
942 951
943 switch (len) { 952 switch (len) {
944 case WACOM_PKGLEN_TPC1FG: 953 case WACOM_PKGLEN_TPC1FG: