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.
  ...

7 files changed, 52 insertions, 41 deletions

diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index 73fe83be34fe..e1429fc6d050 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -540,7 +540,8 @@ static int kingsun_probe(struct usb_interface *intf,
         if (ret != 0)
                 goto free_mem;
 
-        info("IrDA: Registered KingSun/DonShine device %s", net->name);
+        dev_info(&net->dev, "IrDA: Registered KingSun/DonShine device %s\n",
+                 net->name);
 
         usb_set_intfdata(intf, kingsun);
 
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 8c257a51341a..2482d61662a2 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -801,7 +801,8 @@ static int ks959_probe(struct usb_interface *intf,
         if (ret != 0)
                 goto free_mem;
 
-        info("IrDA: Registered KingSun KS-959 device %s", net->name);
+        dev_info(&net->dev, "IrDA: Registered KingSun KS-959 device %s\n",
+                 net->name);
 
         usb_set_intfdata(intf, kingsun);
 
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index d01a28593ce2..1e0de93fd618 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -705,7 +705,8 @@ static int ksdazzle_probe(struct usb_interface *intf,
         if (ret != 0)
                 goto free_mem;
 
-        info("IrDA: Registered KingSun/Dazzle device %s", net->name);
+        dev_info(&net->dev, "IrDA: Registered KingSun/Dazzle device %s\n",
+                 net->name);
 
         usb_set_intfdata(intf, kingsun);
 
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 051963782749..3575804fd7c6 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -506,7 +506,7 @@ static int change_speed(struct stir_cb *stir, unsigned speed)
                         goto found;
         }
 
-        warn("%s: invalid speed %d", stir->netdev->name, speed);
+        dev_warn(&stir->netdev->dev, "invalid speed %d\n", speed);
         return -EINVAL;
 
  found:
@@ -598,8 +598,8 @@ static int fifo_txwait(struct stir_cb *stir, int space)
                 err = read_reg(stir, REG_FIFOCTL, stir->fifo_status, 
                                    FIFO_REGS_SIZE);
                 if (unlikely(err != FIFO_REGS_SIZE)) {
-                        warn("%s: FIFO register read error: %d", 
-                             stir->netdev->name, err);
+                        dev_warn(&stir->netdev->dev,
+                                 "FIFO register read error: %d\n", err);
 
                         return err;
                 }
@@ -783,8 +783,9 @@ static int stir_transmit_thread(void *arg)
 
                         if (unlikely(receive_start(stir))) {
                                 if (net_ratelimit())
-                                        info("%s: receive usb submit failed",
-                                             stir->netdev->name);
+                                        dev_info(&dev->dev,
+                                                 "%s: receive usb submit failed\n",
+                                                 stir->netdev->name);
                                 stir->receiving = 0;
                                 msleep(10);
                                 continue;
@@ -836,8 +837,8 @@ static void stir_rcv_irq(struct urb *urb)
 
         /* in case of error, the kernel thread will restart us */
         if (err) {
-                warn("%s: usb receive submit error: %d",
-                        stir->netdev->name, err);
+                dev_warn(&stir->netdev->dev, "usb receive submit error: %d\n",
+                         err);
                 stir->receiving = 0;
                 wake_up_process(stir->thread);
         }
@@ -1073,7 +1074,8 @@ static int stir_probe(struct usb_interface *intf,
         if (ret != 0)
                 goto err_out2;
 
-        info("IrDA: Registered SigmaTel device %s", net->name);
+        dev_info(&intf->dev, "IrDA: Registered SigmaTel device %s\n",
+                 net->name);
 
         usb_set_intfdata(intf, stir);
 
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 22c17bbacb69..466a89e24444 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -456,7 +456,7 @@ static void catc_tx_timeout(struct net_device *netdev)
 {
         struct catc *catc = netdev_priv(netdev);
 
-        warn("Transmit timed out.");
+        dev_warn(&netdev->dev, "Transmit timed out.\n");
         usb_unlink_urb(catc->tx_urb);
 }
 
@@ -847,7 +847,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
                         dbg("64k Memory\n");
                         break;
                 default:
-                        warn("Couldn't detect memory size, assuming 32k");
+                        dev_warn(&intf->dev,
+                                 "Couldn't detect memory size, assuming 32k\n");
                 case 0x87654321:
                         catc_set_reg(catc, TxBufCount, 4);
                         catc_set_reg(catc, RxBufCount, 16);
@@ -953,7 +954,8 @@ static int __init catc_init(void)
 {
         int result = usb_register(&catc_driver);
         if (result == 0)
-                info(DRIVER_VERSION " " DRIVER_DESC);
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                       DRIVER_DESC "\n");
         return result;
 }
 
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index d6829db51b45..fdbf3be24fda 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -832,7 +832,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net)
 
         if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC)))
         {
-                warn("kaweth failed tx_urb %d", res);
+                dev_warn(&net->dev, "kaweth failed tx_urb %d\n", res);
 skip:
                 kaweth->stats.tx_errors++;
 
@@ -924,7 +924,7 @@ static void kaweth_tx_timeout(struct net_device *net)
 {
         struct kaweth_device *kaweth = netdev_priv(net);
 
-        warn("%s: Tx timed out. Resetting.", net->name);
+        dev_warn(&net->dev, "%s: Tx timed out. Resetting.\n", net->name);
         kaweth->stats.tx_errors++;
         net->trans_start = jiffies;
 
@@ -1016,10 +1016,10 @@ static int kaweth_probe(
          */
 
         if (le16_to_cpu(dev->descriptor.bcdDevice) >> 8) {
-                info("Firmware present in device.");
+                dev_info(&intf->dev, "Firmware present in device.\n");
         } else {
                 /* Download the firmware */
-                info("Downloading firmware...");
+                dev_info(&intf->dev, "Downloading firmware...\n");
                 kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL);
                 if ((result = kaweth_download_firmware(kaweth,
                                                       "kaweth/new_code.bin",
@@ -1061,7 +1061,7 @@ static int kaweth_probe(
                 }
 
                 /* Device will now disappear for a moment...  */
-                info("Firmware loaded.  I'll be back...");
+                dev_info(&intf->dev, "Firmware loaded.  I'll be back...\n");
 err_fw:
                 free_page((unsigned long)kaweth->firmware_buf);
                 free_netdev(netdev);
@@ -1075,10 +1075,10 @@ err_fw:
                 goto err_free_netdev;
         }
 
-        info("Statistics collection: %x", kaweth->configuration.statistics_mask);
-        info("Multicast filter limit: %x", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
-        info("MTU: %d", le16_to_cpu(kaweth->configuration.segment_size));
-        info("Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
+        dev_info(&intf->dev, "Statistics collection: %x\n", kaweth->configuration.statistics_mask);
+        dev_info(&intf->dev, "Multicast filter limit: %x\n", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
+        dev_info(&intf->dev, "MTU: %d\n", le16_to_cpu(kaweth->configuration.segment_size));
+        dev_info(&intf->dev, "Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
                  (int)kaweth->configuration.hw_addr[0],
                  (int)kaweth->configuration.hw_addr[1],
                  (int)kaweth->configuration.hw_addr[2],
@@ -1174,7 +1174,8 @@ err_fw:
                 goto err_intfdata;
         }
 
-        info("kaweth interface created at %s", kaweth->net->name);
+        dev_info(&intf->dev, "kaweth interface created at %s\n",
+                 kaweth->net->name);
 
         dbg("Kaweth probe returning.");
 
@@ -1205,11 +1206,11 @@ static void kaweth_disconnect(struct usb_interface *intf)
         struct kaweth_device *kaweth = usb_get_intfdata(intf);
         struct net_device *netdev;
 
-        info("Unregistering");
+        dev_info(&intf->dev, "Unregistering\n");
 
         usb_set_intfdata(intf, NULL);
         if (!kaweth) {
-                warn("unregistering non-existant device");
+                dev_warn(&intf->dev, "unregistering non-existant device\n");
                 return;
         }
         netdev = kaweth->net;
@@ -1269,7 +1270,7 @@ static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length)
 
         if (!wait_event_timeout(awd.wqh, awd.done, timeout)) {
                 // timeout
-                warn("usb_control/bulk_msg: timeout");
+                dev_warn(&urb->dev->dev, "usb_control/bulk_msg: timeout\n");
                 usb_kill_urb(urb);  // remove urb safely
                 status = -ETIMEDOUT;
         }
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index df56a518691c..6133401ebc67 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -221,7 +221,7 @@ static void ctrl_callback(struct urb *urb)
         case -ENOENT:
                 break;
         default:
-                warn("ctrl urb status %d", urb->status);
+                dev_warn(&urb->dev->dev, "ctrl urb status %d\n", urb->status);
         }
         dev = urb->context;
         clear_bit(RX_REG_SET, &dev->flags);
@@ -441,10 +441,10 @@ static void read_bulk_callback(struct urb *urb)
         case -ENOENT:
                 return; /* the urb is in unlink state */
         case -ETIME:
-                warn("may be reset is needed?..");
+                dev_warn(&urb->dev->dev, "may be reset is needed?..\n");
                 goto goon;
         default:
-                warn("Rx status %d", urb->status);
+                dev_warn(&urb->dev->dev, "Rx status %d\n", urb->status);
                 goto goon;
         }
 
@@ -538,7 +538,8 @@ static void write_bulk_callback(struct urb *urb)
         if (!netif_device_present(dev->netdev))
                 return;
         if (urb->status)
-                info("%s: Tx status %d", dev->netdev->name, urb->status);
+                dev_info(&urb->dev->dev, "%s: Tx status %d\n",
+                         dev->netdev->name, urb->status);
         dev->netdev->trans_start = jiffies;
         netif_wake_queue(dev->netdev);
 }
@@ -561,7 +562,8 @@ static void intr_callback(struct urb *urb)
                 return;
         /* -EPIPE:  should clear the halt */
         default:
-                info("%s: intr status %d", dev->netdev->name, urb->status);
+                dev_info(&urb->dev->dev, "%s: intr status %d\n",
+                         dev->netdev->name, urb->status);
                 goto resubmit;
         }
 
@@ -665,7 +667,7 @@ static int enable_net_traffic(rtl8150_t * dev)
         u8 cr, tcr, rcr, msr;
 
         if (!rtl8150_reset(dev)) {
-                warn("%s - device reset failed", __FUNCTION__);
+                dev_warn(&dev->udev->dev, "device reset failed\n");
         }
         /* RCR bit7=1 attach Rx info at the end;  =0 HW CRC (which is broken) */
         rcr = 0x9e;
@@ -699,7 +701,7 @@ static struct net_device_stats *rtl8150_netdev_stats(struct net_device *dev)
 static void rtl8150_tx_timeout(struct net_device *netdev)
 {
         rtl8150_t *dev = netdev_priv(netdev);
-        warn("%s: Tx timeout.", netdev->name);
+        dev_warn(&netdev->dev, "Tx timeout.\n");
         usb_unlink_urb(dev->tx_urb);
         dev->stats.tx_errors++;
 }
@@ -710,12 +712,12 @@ static void rtl8150_set_multicast(struct net_device *netdev)
         netif_stop_queue(netdev);
         if (netdev->flags & IFF_PROMISC) {
                 dev->rx_creg |= cpu_to_le16(0x0001);
-                info("%s: promiscuous mode", netdev->name);
+                dev_info(&netdev->dev, "%s: promiscuous mode\n", netdev->name);
         } else if (netdev->mc_count ||
                    (netdev->flags & IFF_ALLMULTI)) {
                 dev->rx_creg &= cpu_to_le16(0xfffe);
                 dev->rx_creg |= cpu_to_le16(0x0002);
-                info("%s: allmulti set", netdev->name);
+                dev_info(&netdev->dev, "%s: allmulti set\n", netdev->name);
         } else {
                 /* ~RX_MULTICAST, ~RX_PROMISCUOUS */
                 dev->rx_creg &= cpu_to_le16(0x00fc);
@@ -740,7 +742,7 @@ static int rtl8150_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                 if (res == -ENODEV)
                         netif_device_detach(dev->netdev);
                 else {
-                        warn("failed tx_urb %d\n", res);
+                        dev_warn(&netdev->dev, "failed tx_urb %d\n", res);
                         dev->stats.tx_errors++;
                         netif_start_queue(netdev);
                 }
@@ -783,7 +785,7 @@ static int rtl8150_open(struct net_device *netdev)
         if ((res = usb_submit_urb(dev->rx_urb, GFP_KERNEL))) {
                 if (res == -ENODEV)
                         netif_device_detach(dev->netdev);
-                warn("%s: rx_urb submit failed: %d", __FUNCTION__, res);
+                dev_warn(&netdev->dev, "rx_urb submit failed: %d\n", res);
                 return res;
         }
         usb_fill_int_urb(dev->intr_urb, dev->udev, usb_rcvintpipe(dev->udev, 3),
@@ -792,7 +794,7 @@ static int rtl8150_open(struct net_device *netdev)
         if ((res = usb_submit_urb(dev->intr_urb, GFP_KERNEL))) {
                 if (res == -ENODEV)
                         netif_device_detach(dev->netdev);
-                warn("%s: intr_urb submit failed: %d", __FUNCTION__, res);
+                dev_warn(&netdev->dev, "intr_urb submit failed: %d\n", res);
                 usb_kill_urb(dev->rx_urb);
                 return res;
         }
@@ -947,7 +949,7 @@ static int rtl8150_probe(struct usb_interface *intf,
                 goto out2;
         }
 
-        info("%s: rtl8150 is detected", netdev->name);
+        dev_info(&intf->dev, "%s: rtl8150 is detected\n", netdev->name);
 
         return 0;
 
@@ -984,7 +986,8 @@ static void rtl8150_disconnect(struct usb_interface *intf)
 
 static int __init usb_rtl8150_init(void)
 {
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return usb_register(&rtl8150_driver);
 }