aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/image
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-08-14 12:37:34 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-17 17:41:09 -0400
commit3b6004f3b5a8b4506fa8dee29667aed44913a990 (patch)
tree0f54fd20c8646c7e58a634cddfb5af03730fe9d3 /drivers/usb/image
parent4dc8994806a812044e48514af60d4b4e0315f237 (diff)
USB: remove warn() macro from usb 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(). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/image')
-rw-r--r--drivers/usb/image/mdc800.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index 0fb114ca1eba..228552beb534 100644
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -361,7 +361,8 @@ static int mdc800_usb_waitForIRQ (int mode, int msec)
361 361
362 if (mdc800->state == NOT_CONNECTED) 362 if (mdc800->state == NOT_CONNECTED)
363 { 363 {
364 warn ("Camera gets disconnected during waiting for irq."); 364 printk(KERN_WARNING "mdc800: Camera gets disconnected "
365 "during waiting for irq.\n");
365 mdc800->camera_request_ready=0; 366 mdc800->camera_request_ready=0;
366 return -2; 367 return -2;
367 } 368 }
@@ -443,7 +444,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
443 444
444 if (mdc800->dev != NULL) 445 if (mdc800->dev != NULL)
445 { 446 {
446 warn ("only one Mustek MDC800 is supported."); 447 dev_warn(&intf->dev, "only one Mustek MDC800 is supported.\n");
447 return -ENODEV; 448 return -ENODEV;
448 } 449 }
449 450
@@ -701,7 +702,8 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
701 } 702 }
702 if (mdc800->state == WORKING) 703 if (mdc800->state == WORKING)
703 { 704 {
704 warn ("Illegal State \"working\" reached during read ?!"); 705 printk(KERN_WARNING "mdc800: Illegal State \"working\""
706 "reached during read ?!\n");
705 mutex_unlock(&mdc800->io_lock); 707 mutex_unlock(&mdc800->io_lock);
706 return -EBUSY; 708 return -EBUSY;
707 } 709 }