diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 00:33:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 00:33:54 -0400 |
commit | 0a3fd536e685e0ceb646de1a43821bd11c0be75c (patch) | |
tree | bb269920dbd5b55731571c2ada3d47381864555a | |
parent | 1b6d8232586e4c144f5e90ab9606884dcf62c18f (diff) |
USB: appledisplay.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: Andrew Morton <akpm@linux-foundation.org>
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: Mike Frysinger <vapier@gentoo.org>
CC: Arun Sharma <asharma@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/misc/appledisplay.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c index ac0d75a9005a..0fc6e5fc745f 100644 --- a/drivers/usb/misc/appledisplay.c +++ b/drivers/usb/misc/appledisplay.c | |||
@@ -88,6 +88,7 @@ static struct workqueue_struct *wq; | |||
88 | static void appledisplay_complete(struct urb *urb) | 88 | static void appledisplay_complete(struct urb *urb) |
89 | { | 89 | { |
90 | struct appledisplay *pdata = urb->context; | 90 | struct appledisplay *pdata = urb->context; |
91 | struct device *dev = &pdata->udev->dev; | ||
91 | unsigned long flags; | 92 | unsigned long flags; |
92 | int status = urb->status; | 93 | int status = urb->status; |
93 | int retval; | 94 | int retval; |
@@ -97,18 +98,18 @@ static void appledisplay_complete(struct urb *urb) | |||
97 | /* success */ | 98 | /* success */ |
98 | break; | 99 | break; |
99 | case -EOVERFLOW: | 100 | case -EOVERFLOW: |
100 | printk(KERN_ERR "appletouch: OVERFLOW with data " | 101 | dev_err(dev, |
101 | "length %d, actual length is %d\n", | 102 | "OVERFLOW with data length %d, actual length is %d\n", |
102 | ACD_URB_BUFFER_LEN, pdata->urb->actual_length); | 103 | ACD_URB_BUFFER_LEN, pdata->urb->actual_length); |
103 | case -ECONNRESET: | 104 | case -ECONNRESET: |
104 | case -ENOENT: | 105 | case -ENOENT: |
105 | case -ESHUTDOWN: | 106 | case -ESHUTDOWN: |
106 | /* This urb is terminated, clean up */ | 107 | /* This urb is terminated, clean up */ |
107 | dbg("%s - urb shuttingdown with status: %d", | 108 | dev_dbg(dev, "%s - urb shuttingdown with status: %d\n", |
108 | __func__, status); | 109 | __func__, status); |
109 | return; | 110 | return; |
110 | default: | 111 | default: |
111 | dbg("%s - nonzero urb status received: %d", | 112 | dev_dbg(dev, "%s - nonzero urb status received: %d/n", |
112 | __func__, status); | 113 | __func__, status); |
113 | goto exit; | 114 | goto exit; |
114 | } | 115 | } |
@@ -132,8 +133,7 @@ static void appledisplay_complete(struct urb *urb) | |||
132 | exit: | 133 | exit: |
133 | retval = usb_submit_urb(pdata->urb, GFP_ATOMIC); | 134 | retval = usb_submit_urb(pdata->urb, GFP_ATOMIC); |
134 | if (retval) { | 135 | if (retval) { |
135 | dev_err(&pdata->udev->dev, | 136 | dev_err(dev, "%s - usb_submit_urb failed with result %d\n", |
136 | "%s - usb_submit_urb failed with result %d\n", | ||
137 | __func__, retval); | 137 | __func__, retval); |
138 | } | 138 | } |
139 | } | 139 | } |