diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 00:33:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 00:33:12 -0400 |
commit | 8fb6321b6bd9ebcc03243f27fe98e18e246a5c97 (patch) | |
tree | 1b2896fbd76ed37a5a8c84aedf86fa7f77708514 /drivers/input/tablet | |
parent | eeba1ae13cbddc6e9cbc4adcd0d9fd686ba09f5f (diff) |
USB: aiptek.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: 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>
Diffstat (limited to 'drivers/input/tablet')
-rw-r--r-- | drivers/input/tablet/aiptek.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index dc16bfd24738..37dba769bf0f 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c | |||
@@ -447,13 +447,15 @@ static void aiptek_irq(struct urb *urb) | |||
447 | case -ENOENT: | 447 | case -ENOENT: |
448 | case -ESHUTDOWN: | 448 | case -ESHUTDOWN: |
449 | /* This urb is terminated, clean up */ | 449 | /* This urb is terminated, clean up */ |
450 | dbg("%s - urb shutting down with status: %d", | 450 | dev_dbg(&inputdev->dev, |
451 | __func__, urb->status); | 451 | "%s - urb shutting down with status: %d\n", |
452 | __func__, urb->status); | ||
452 | return; | 453 | return; |
453 | 454 | ||
454 | default: | 455 | default: |
455 | dbg("%s - nonzero urb status received: %d", | 456 | dev_dbg(&inputdev->dev, |
456 | __func__, urb->status); | 457 | "%s - nonzero urb status received: %d\n", |
458 | __func__, urb->status); | ||
457 | goto exit; | 459 | goto exit; |
458 | } | 460 | } |
459 | 461 | ||
@@ -785,7 +787,7 @@ static void aiptek_irq(struct urb *urb) | |||
785 | 1 | AIPTEK_REPORT_TOOL_UNKNOWN); | 787 | 1 | AIPTEK_REPORT_TOOL_UNKNOWN); |
786 | input_sync(inputdev); | 788 | input_sync(inputdev); |
787 | } else { | 789 | } else { |
788 | dbg("Unknown report %d", data[0]); | 790 | dev_dbg(&inputdev->dev, "Unknown report %d\n", data[0]); |
789 | } | 791 | } |
790 | 792 | ||
791 | /* Jitter may occur when the user presses a button on the stlyus | 793 | /* Jitter may occur when the user presses a button on the stlyus |
@@ -913,8 +915,9 @@ aiptek_command(struct aiptek *aiptek, unsigned char command, unsigned char data) | |||
913 | 915 | ||
914 | if ((ret = | 916 | if ((ret = |
915 | aiptek_set_report(aiptek, 3, 2, buf, sizeof_buf)) != sizeof_buf) { | 917 | aiptek_set_report(aiptek, 3, 2, buf, sizeof_buf)) != sizeof_buf) { |
916 | dbg("aiptek_program: failed, tried to send: 0x%02x 0x%02x", | 918 | dev_dbg(&aiptek->inputdev->dev, |
917 | command, data); | 919 | "aiptek_program: failed, tried to send: 0x%02x 0x%02x\n", |
920 | command, data); | ||
918 | } | 921 | } |
919 | kfree(buf); | 922 | kfree(buf); |
920 | return ret < 0 ? ret : 0; | 923 | return ret < 0 ? ret : 0; |
@@ -948,8 +951,9 @@ aiptek_query(struct aiptek *aiptek, unsigned char command, unsigned char data) | |||
948 | 951 | ||
949 | if ((ret = | 952 | if ((ret = |
950 | aiptek_get_report(aiptek, 3, 2, buf, sizeof_buf)) != sizeof_buf) { | 953 | aiptek_get_report(aiptek, 3, 2, buf, sizeof_buf)) != sizeof_buf) { |
951 | dbg("aiptek_query failed: returned 0x%02x 0x%02x 0x%02x", | 954 | dev_dbg(&aiptek->inputdev->dev, |
952 | buf[0], buf[1], buf[2]); | 955 | "aiptek_query failed: returned 0x%02x 0x%02x 0x%02x\n", |
956 | buf[0], buf[1], buf[2]); | ||
953 | ret = -EIO; | 957 | ret = -EIO; |
954 | } else { | 958 | } else { |
955 | ret = get_unaligned_le16(buf + 1); | 959 | ret = get_unaligned_le16(buf + 1); |