hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: appletouch.c: remove dbg() usage 

dbg() was a very old USB-specific macro that should no longer
be used. This patch removes it from being used in the driver
and uses dev_dbg() instead.

CC: Alessandro Rubini <rubini@ipvvis.unipv.it>
CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-05-01 21:33:04 -07:00
parent 938476f923
commit 67946d1368
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/input/mouse/appletouch.c
View File

@ -401,6 +401,7 @@ static inline void atp_report_fingers(struct input_dev *input, int fingers)
static int atp_status_check(struct urb *urb) static int atp_status_check(struct urb *urb)
{ {
struct atp *dev = urb->context; struct atp *dev = urb->context;
struct input_dev *idev = dev->input;
switch (urb->status) { switch (urb->status) {
case 0: case 0:
@ -408,8 +409,8 @@ static int atp_status_check(struct urb *urb)
break; break;
case -EOVERFLOW: case -EOVERFLOW:
if (!dev->overflow_warned) { if (!dev->overflow_warned) {
printk(KERN_WARNING "appletouch: OVERFLOW with data " dev_warn(&idev->dev,
"length %d, actual length is %d\n", "appletouch: OVERFLOW with data length %d, actual length is %d\n",
dev->info->datalen, dev->urb->actual_length); dev->info->datalen, dev->urb->actual_length);
dev->overflow_warned = true; dev->overflow_warned = true;
} }
@ -417,12 +418,14 @@ static int atp_status_check(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* This urb is terminated, clean up */ /* This urb is terminated, clean up */
dbg("atp_complete: urb shutting down with status: %d", dev_dbg(&idev->dev,
"atp_complete: urb shutting down with status: %d\n",
urb->status); urb->status);
return ATP_URB_STATUS_ERROR_FATAL; return ATP_URB_STATUS_ERROR_FATAL;
default: default:
dbg("atp_complete: nonzero urb status received: %d", dev_dbg(&idev->dev,
"atp_complete: nonzero urb status received: %d\n",
urb->status); urb->status);
return ATP_URB_STATUS_ERROR; return ATP_URB_STATUS_ERROR;
} }
@ -446,7 +449,8 @@ static void atp_detect_size(struct atp *dev)
for (i = dev->info->xsensors; i < ATP_XSENSORS; i++) { for (i = dev->info->xsensors; i < ATP_XSENSORS; i++) {
if (dev->xy_cur[i]) { if (dev->xy_cur[i]) {
printk(KERN_INFO "appletouch: 17\" model detected.\n"); dev_info(&dev->input->dev,
"appletouch: 17\" model detected.\n");
input_set_abs_params(dev->input, ABS_X, 0, input_set_abs_params(dev->input, ABS_X, 0,
(dev->info->xsensors_17 - 1) * (dev->info->xsensors_17 - 1) *