Skip to content

Commit

Permalink
USB: aiptek.c: remove dbg() usage
Browse files Browse the repository at this point in the history
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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
CC: Jesper Juhl <jj@chaosbits.net>
CC: JJ Ding <dgdunix@gmail.com>
CC: Edwin van Vliet <edwin@cheatah.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed May 2, 2012
1 parent eeba1ae commit 8fb6321
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions drivers/input/tablet/aiptek.c
Original file line number Diff line number Diff line change
Expand Up @@ -447,13 +447,15 @@ static void aiptek_irq(struct urb *urb)
case -ENOENT:
case -ESHUTDOWN:
/* This urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d",
__func__, urb->status);
dev_dbg(&inputdev->dev,
"%s - urb shutting down with status: %d\n",
__func__, urb->status);
return;

default:
dbg("%s - nonzero urb status received: %d",
__func__, urb->status);
dev_dbg(&inputdev->dev,
"%s - nonzero urb status received: %d\n",
__func__, urb->status);
goto exit;
}

Expand Down Expand Up @@ -785,7 +787,7 @@ static void aiptek_irq(struct urb *urb)
1 | AIPTEK_REPORT_TOOL_UNKNOWN);
input_sync(inputdev);
} else {
dbg("Unknown report %d", data[0]);
dev_dbg(&inputdev->dev, "Unknown report %d\n", data[0]);
}

/* Jitter may occur when the user presses a button on the stlyus
Expand Down Expand Up @@ -913,8 +915,9 @@ aiptek_command(struct aiptek *aiptek, unsigned char command, unsigned char data)

if ((ret =
aiptek_set_report(aiptek, 3, 2, buf, sizeof_buf)) != sizeof_buf) {
dbg("aiptek_program: failed, tried to send: 0x%02x 0x%02x",
command, data);
dev_dbg(&aiptek->inputdev->dev,
"aiptek_program: failed, tried to send: 0x%02x 0x%02x\n",
command, data);
}
kfree(buf);
return ret < 0 ? ret : 0;
Expand Down Expand Up @@ -948,8 +951,9 @@ aiptek_query(struct aiptek *aiptek, unsigned char command, unsigned char data)

if ((ret =
aiptek_get_report(aiptek, 3, 2, buf, sizeof_buf)) != sizeof_buf) {
dbg("aiptek_query failed: returned 0x%02x 0x%02x 0x%02x",
buf[0], buf[1], buf[2]);
dev_dbg(&aiptek->inputdev->dev,
"aiptek_query failed: returned 0x%02x 0x%02x 0x%02x\n",
buf[0], buf[1], buf[2]);
ret = -EIO;
} else {
ret = get_unaligned_le16(buf + 1);
Expand Down

0 comments on commit 8fb6321

Please sign in to comment.