diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-14 12:37:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:08 -0400 |
commit | aa82661baf8a48379355ffa8bf162b07cf487600 (patch) | |
tree | 22b555a5227c2d6f3a145d5a5350b2b473602262 /drivers/media/video/dabusb.c | |
parent | 1817b1692a2eab022e805d32e910f4556c89dce8 (diff) |
USB: remove warn() macro from usb media drivers
USB should not be having it's own printk macros, so remove warn() and
use the system-wide standard of dev_warn() wherever possible. In the
few places that will not work out, use a basic printk().
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/media/video/dabusb.c')
-rw-r--r-- | drivers/media/video/dabusb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index 3aa538afcc0b..298810d5262b 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
@@ -192,7 +192,7 @@ static void dabusb_iso_complete (struct urb *purb) | |||
192 | err("dabusb_iso_complete: invalid len %d", len); | 192 | err("dabusb_iso_complete: invalid len %d", len); |
193 | } | 193 | } |
194 | else | 194 | else |
195 | warn("dabusb_iso_complete: corrupted packet status: %d", purb->iso_frame_desc[i].status); | 195 | dev_warn(&purb->dev->dev, "dabusb_iso_complete: corrupted packet status: %d\n", purb->iso_frame_desc[i].status); |
196 | if (dst != purb->actual_length) | 196 | if (dst != purb->actual_length) |
197 | err("dst!=purb->actual_length:%d!=%d", dst, purb->actual_length); | 197 | err("dst!=purb->actual_length:%d!=%d", dst, purb->actual_length); |
198 | } | 198 | } |
@@ -289,7 +289,7 @@ static int dabusb_bulk (pdabusb_t s, pbulk_transfer_t pb) | |||
289 | } | 289 | } |
290 | 290 | ||
291 | if( ret == -EPIPE ) { | 291 | if( ret == -EPIPE ) { |
292 | warn("CLEAR_FEATURE request to remove STALL condition."); | 292 | dev_warn(&s->usbdev->dev, "CLEAR_FEATURE request to remove STALL condition.\n"); |
293 | if(usb_clear_halt(s->usbdev, usb_pipeendpoint(pipe))) | 293 | if(usb_clear_halt(s->usbdev, usb_pipeendpoint(pipe))) |
294 | err("request failed"); | 294 | err("request failed"); |
295 | } | 295 | } |