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, 10 insertions, 7 deletions

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 99e9a14c5bf6..bf1ae247da66 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -742,11 +742,13 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial)
                 fw_name = "keyspan_pda/xircom_pgs.fw";
 #endif
         else {
-                err("%s: unknown vendor, aborting.", __func__);
+                dev_err(&serial->dev->dev, "%s: unknown vendor, aborting.\n",
+                        __func__);
                 return -ENODEV;
         }
         if (request_ihex_firmware(&fw, fw_name, &serial->dev->dev)) {
-                err("failed to load firmware \"%s\"\n", fw_name);
+                dev_err(&serial->dev->dev, "failed to load firmware \"%s\"\n",
+                        fw_name);
                 return -ENOENT;
         }
         record = (const struct ihex_binrec *)fw->data;
@@ -756,10 +758,10 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial)
                                              (unsigned char *)record->data,
                                              be16_to_cpu(record->len), 0xa0);
                 if (response < 0) {
-                        err("ezusb_writememory failed for Keyspan PDA "
-                            "firmware (%d %04X %p %d)",
-                            response, be32_to_cpu(record->addr),
-                            record->data, be16_to_cpu(record->len));
+                        dev_err(&serial->dev->dev, "ezusb_writememory failed "
+                                "for Keyspan PDA firmware (%d %04X %p %d)\n",
+                                response, be32_to_cpu(record->addr),
+                                record->data, be16_to_cpu(record->len));
                         break;
                 }
                 record = ihex_next_binrec(record);
@@ -874,7 +876,8 @@ static int __init keyspan_pda_init(void)
         retval = usb_register(&keyspan_pda_driver);
         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:
 #ifdef XIRCOM