Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (94 commits)
  USB: remove err() macro from more usb drivers
  USB: remove err() macro from usb misc drivers
  USB: remove err() macro from usb core code
  USB: remove err() macro from usb class drivers
  USB: remove use of err() in drivers/usb/serial
  USB: remove info() macro from usb mtd drivers
  USB: remove info() macro from usb input drivers
  USB: remove info() macro from usb network drivers
  USB: remove info() macro from remaining usb drivers
  USB: remove info() macro from usb/misc drivers
  USB: remove info() macro from usb/serial drivers
  USB: remove warn macro from HID core
  USB: remove warn() macro from usb drivers
  USB: remove warn() macro from usb net drivers
  USB: remove warn() macro from usb media drivers
  USB: remove warn() macro from usb input drivers
  usb/fsl_qe_udc: clear data toggle on clear halt request
  usb/fsl_qe_udc: fix response to get status request
  fsl_usb2_udc: Fix oops on probe failure.
  fsl_usb2_udc: Add a wmb before priming endpoint.
  ...

1 files changed, 17 insertions, 11 deletions

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 94ef36c4764b..858bdd038fbc 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -141,7 +141,8 @@ static int cyberjack_startup(struct usb_serial *serial)
                 result = usb_submit_urb(serial->port[i]->interrupt_in_urb,
                                         GFP_KERNEL);
                 if (result)
-                        err(" usb_submit_urb(read int) failed");
+                        dev_err(&serial->dev->dev,
+                                "usb_submit_urb(read int) failed\n");
                 dbg("%s - usb_submit_urb(int urb)", __func__);
         }
 
@@ -274,8 +275,9 @@ static int cyberjack_write(struct tty_struct *tty,
                 /* send the data out the bulk port */
                 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                 if (result) {
-                        err("%s - failed submitting write urb, error %d",
-                                                        __func__, result);
+                        dev_err(&port->dev,
+                                "%s - failed submitting write urb, error %d",
+                                __func__, result);
                         /* Throw away data. No better idea what to do with it. */
                         priv->wrfilled = 0;
                         priv->wrsent = 0;
@@ -351,7 +353,9 @@ static void cyberjack_read_int_callback(struct urb *urb)
                         port->read_urb->dev = port->serial->dev;
                         result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                         if (result)
-                                err("%s - failed resubmitting read urb, error %d", __func__, result);
+                                dev_err(&port->dev, "%s - failed resubmitting "
+                                        "read urb, error %d\n",
+                                        __func__, result);
                         dbg("%s - usb_submit_urb(read urb)", __func__);
                 }
         }
@@ -360,7 +364,7 @@ resubmit:
         port->interrupt_in_urb->dev = port->serial->dev;
         result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
         if (result)
-                err(" usb_submit_urb(read int) failed");
+                dev_err(&port->dev, "usb_submit_urb(read int) failed\n");
         dbg("%s - usb_submit_urb(int urb)", __func__);
 }
 
@@ -414,8 +418,8 @@ static void cyberjack_read_bulk_callback(struct urb *urb)
                 port->read_urb->dev = port->serial->dev;
                 result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                 if (result)
-                        err("%s - failed resubmitting read urb, error %d",
-                                __func__, result);
+                        dev_err(&port->dev, "%s - failed resubmitting read "
+                                "urb, error %d\n", __func__, result);
                 dbg("%s - usb_submit_urb(read urb)", __func__);
         }
 }
@@ -462,8 +466,9 @@ static void cyberjack_write_bulk_callback(struct urb *urb)
                 /* send the data out the bulk port */
                 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                 if (result) {
-                        err("%s - failed submitting write urb, error %d",
-                                                                __func__, result);
+                        dev_err(&port->dev,
+                                "%s - failed submitting write urb, error %d\n",
+                                __func__, result);
                         /* Throw away data. No better idea what to do with it. */
                         priv->wrfilled = 0;
                         priv->wrsent = 0;
@@ -499,8 +504,9 @@ static int __init cyberjack_init(void)
         if (retval)
                 goto failed_usb_register;
 
-        info(DRIVER_VERSION " " DRIVER_AUTHOR);
-        info(DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION " "
+               DRIVER_AUTHOR "\n");
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
 
         return 0;
 failed_usb_register: