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, 12 insertions, 9 deletions

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index f3514a91f915..eae4740d448c 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -404,8 +404,8 @@ static int cypress_serial_control(struct tty_struct *tty,
                          retval != -ENODEV);
 
                 if (retval != sizeof(feature_buffer)) {
-                        err("%s - failed sending serial line settings - %d",
-                                                        __func__, retval);
+                        dev_err(&port->dev, "%s - failed sending serial "
+                                "line settings - %d\n", __func__, retval);
                         cypress_set_dead(port);
                 } else {
                         spin_lock_irqsave(&priv->lock, flags);
@@ -443,7 +443,8 @@ static int cypress_serial_control(struct tty_struct *tty,
                                                 && retval != -ENODEV);
 
                 if (retval != sizeof(feature_buffer)) {
-                        err("%s - failed to retrieve serial line settings - %d", __func__, retval);
+                        dev_err(&port->dev, "%s - failed to retrieve serial "
+                                "line settings - %d\n", __func__, retval);
                         cypress_set_dead(port);
                         return retval;
                 } else {
@@ -476,8 +477,8 @@ static void cypress_set_dead(struct usb_serial_port *port)
         priv->comm_is_ok = 0;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        err("cypress_m8 suspending failing port %d - interval might be too short",
-            port->number);
+        dev_err(&port->dev, "cypress_m8 suspending failing port %d - "
+                "interval might be too short\n", port->number);
 }
 
 
@@ -679,7 +680,8 @@ static int cypress_open(struct tty_struct *tty,
 
         /* setup the port and start reading from the device */
         if (!port->interrupt_in_urb) {
-                err("%s - interrupt_in_urb is empty!", __func__);
+                dev_err(&port->dev, "%s - interrupt_in_urb is empty!\n",
+                        __func__);
                 return -1;
         }
 
@@ -1107,8 +1109,8 @@ static void cypress_set_termios(struct tty_struct *tty,
                 data_bits = 3;
                 break;
         default:
-                err("%s - CSIZE was set, but not CS5-CS8",
-                                __func__);
+                dev_err(&port->dev, "%s - CSIZE was set, but not CS5-CS8\n",
+                        __func__);
                 data_bits = 3;
         }
         spin_lock_irqsave(&priv->lock, flags);
@@ -1658,7 +1660,8 @@ static int __init cypress_init(void)
         if (retval)
                 goto failed_usb_register;
 
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 
 failed_usb_register: