USB: remove err() macro from usb misc drivers

[linux-2.6-omap-h63xx.git] / drivers / usb / misc / adutux.c

diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 92f58ccc8fb3f6efb562329c61ff71ee0bdb2fd3..7b6922e08ed1bd2ecfcc45fd6a12fe58529da2b6 100644 (file)
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -283,8 +283,8 @@ static int adu_open(struct inode *inode, struct file *file)
 
        interface = usb_find_interface(&adu_driver, subminor);
        if (!interface) {
-               err("%s - error, can't find device for minor %d",
-                   __func__, subminor);
+               printk(KERN_ERR "adutux: %s - error, can't find device for "
+                      "minor %d\n", __func__, subminor);
                retval = -ENODEV;
                goto exit_no_device;
        }
@@ -416,7 +416,8 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
        /* verify that the device wasn't unplugged */
        if (dev->udev == NULL) {
                retval = -ENODEV;
-               err("No device or device unplugged %d", retval);
+               printk(KERN_ERR "adutux: No device or device unplugged %d\n",
+                      retval);
                goto exit;
        }
 
@@ -576,7 +577,8 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
        /* verify that the device wasn't unplugged */
        if (dev->udev == NULL) {
                retval = -ENODEV;
-               err("No device or device unplugged %d", retval);
+               printk(KERN_ERR "adutux: No device or device unplugged %d\n",
+                      retval);
                goto exit;
        }
 
@@ -645,7 +647,8 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
                        retval = usb_submit_urb(dev->interrupt_out_urb, GFP_KERNEL);
                        if (retval < 0) {
                                dev->out_urb_finished = 1;
-                               err("Couldn't submit interrupt_out_urb %d", retval);
+                               dev_err(&dev->udev->dev, "Couldn't submit "
+                                       "interrupt_out_urb %d\n", retval);
                                goto exit;
                        }
 
@@ -890,8 +893,8 @@ static int __init adu_init(void)
        /* register this driver with the USB subsystem */
        result = usb_register(&adu_driver);
        if (result < 0) {
-               err("usb_register failed for the "__FILE__" driver. "
-                   "Error number %d", result);
+               printk(KERN_ERR "usb_register failed for the "__FILE__
+                      " driver. Error number %d\n", result);
                goto exit;
        }