Merge tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB 3.5-rc1 changes from Greg Kroah-Hartman:
 "Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.

  It's touches a lot of different parts of the kernel, all USB drivers,
  due to some API cleanups (getting rid of the ancient err() macro) and
  some changes that are needed for USB 3.0 power management updates.

  There are also lots of new drivers, pimarily gadget, but others as
  well.  We deleted a staging driver, which was nice, and finally
  dropped the obsolete usbfs code, which will make Al happy to never
  have to touch that again.

  There were some build errors in the tree that linux-next found a few
  days ago, but those were fixed by the most recent changes (all were
  due to us not building with CONFIG_PM disabled.)

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)
  xhci: Fix DIV_ROUND_UP compile error.
  xhci: Fix compile with CONFIG_USB_SUSPEND=n
  USB: Fix core compile with CONFIG_USB_SUSPEND=n
  brcm80211: Fix compile error for .disable_hub_initiated_lpm.
  Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
  MAINTAINERS: Add myself as maintainer to the USB PHY Layer
  USB: EHCI: fix command register configuration lost problem
  USB: Remove races in devio.c
  USB: ehci-platform: remove update_device
  USB: Disable hub-initiated LPM for comms devices.
  xhci: Add Intel U1/U2 timeout policy.
  xhci: Add infrastructure for host-specific LPM policies.
  USB: Add macros for interrupt endpoint types.
  xhci: Reserve one command for USB3 LPM disable.
  xhci: Some Evaluate Context commands must succeed.
  USB: Disable USB 3.0 LPM in critical sections.
  USB: Add support to enable/disable USB3 link states.
  USB: Allow drivers to disable hub-initiated LPM.
  USB: Calculate USB 3.0 exit latencies for LPM.
  USB: Refactor code to set LPM support flag.
  ...

Conflicts:
	arch/arm/mach-exynos/mach-nuri.c
	arch/arm/mach-exynos/mach-universal_c210.c
	drivers/net/wireless/ath/ath6kl/usb.c

27 files changed, 110 insertions, 58 deletions

diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 42b5151aa78..71e2b0523bc 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -1647,6 +1647,7 @@ static struct usb_driver asix_driver = {
         .resume =       usbnet_resume,
         .disconnect =   usbnet_disconnect,
         .supports_autosuspend = 1,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(asix_driver);
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 182cfb4aeb1..26c5bebd9ec 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -338,16 +338,18 @@ static void catc_irq_done(struct urb *urb)
                 } else {
                         catc->rx_urb->dev = catc->usbdev;
                         if ((res = usb_submit_urb(catc->rx_urb, GFP_ATOMIC)) < 0) {
-                                err("submit(rx_urb) status %d", res);
+                                dev_err(&catc->usbdev->dev,
+                                        "submit(rx_urb) status %d\n", res);
                         }
                 } 
         }
 resubmit:
         res = usb_submit_urb (urb, GFP_ATOMIC);
         if (res)
-                err ("can't resubmit intr, %s-%s, status %d",
-                                catc->usbdev->bus->bus_name,
-                                catc->usbdev->devpath, res);
+                dev_err(&catc->usbdev->dev,
+                        "can't resubmit intr, %s-%s, status %d\n",
+                        catc->usbdev->bus->bus_name,
+                        catc->usbdev->devpath, res);
 }
 
 /*
@@ -366,7 +368,8 @@ static int catc_tx_run(struct catc *catc)
         catc->tx_urb->dev = catc->usbdev;
 
         if ((status = usb_submit_urb(catc->tx_urb, GFP_ATOMIC)) < 0)
-                err("submit(tx_urb), status %d", status);
+                dev_err(&catc->usbdev->dev, "submit(tx_urb), status %d\n",
+                        status);
 
         catc->tx_idx = !catc->tx_idx;
         catc->tx_ptr = 0;
@@ -496,7 +499,8 @@ static void catc_ctrl_run(struct catc *catc)
                 memcpy(catc->ctrl_buf, q->buf, q->len);
 
         if ((status = usb_submit_urb(catc->ctrl_urb, GFP_ATOMIC)))
-                err("submit(ctrl_urb) status %d", status);
+                dev_err(&catc->usbdev->dev, "submit(ctrl_urb) status %d\n",
+                        status);
 }
 
 static void catc_ctrl_done(struct urb *urb)
@@ -555,7 +559,7 @@ static int catc_ctrl_async(struct catc *catc, u8 dir, u8 request, u16 value,
         catc->ctrl_head = (catc->ctrl_head + 1) & (CTRL_QUEUE - 1);
 
         if (catc->ctrl_head == catc->ctrl_tail) {
-                err("ctrl queue full");
+                dev_err(&catc->usbdev->dev, "ctrl queue full\n");
                 catc->ctrl_tail = (catc->ctrl_tail + 1) & (CTRL_QUEUE - 1);
                 retval = -1;
         }
@@ -714,7 +718,8 @@ static int catc_open(struct net_device *netdev)
 
         catc->irq_urb->dev = catc->usbdev;
         if ((status = usb_submit_urb(catc->irq_urb, GFP_KERNEL)) < 0) {
-                err("submit(irq_urb) status %d", status);
+                dev_err(&catc->usbdev->dev, "submit(irq_urb) status %d\n",
+                        status);
                 return -1;
         }
 
@@ -769,7 +774,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
 
         if (usb_set_interface(usbdev,
                         intf->altsetting->desc.bInterfaceNumber, 1)) {
-                err("Can't set altsetting 1.");
+                dev_err(&intf->dev, "Can't set altsetting 1.\n");
                 return -EIO;
         }
 
@@ -799,7 +804,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
         catc->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
         if ((!catc->ctrl_urb) || (!catc->tx_urb) || 
             (!catc->rx_urb) || (!catc->irq_urb)) {
-                err("No free urbs available.");
+                dev_err(&intf->dev, "No free urbs available.\n");
                 usb_free_urb(catc->ctrl_urb);
                 usb_free_urb(catc->tx_urb);
                 usb_free_urb(catc->rx_urb);
@@ -947,6 +952,7 @@ static struct usb_driver catc_driver = {
         .probe =        catc_probe,
         .disconnect =   catc_disconnect,
         .id_table =     catc_id_table,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(catc_driver);
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 3e41b00c680..d848d4dd575 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -457,6 +457,7 @@ static struct usb_driver usbpn_driver = {
         .probe =        usbpn_probe,
         .disconnect =   usbpn_disconnect,
         .id_table =     usbpn_ids,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(usbpn_driver);
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index 685a4e22c76..434d5af8e6f 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -368,6 +368,7 @@ static struct usb_driver eem_driver = {
         .disconnect =   usbnet_disconnect,
         .suspend =      usbnet_suspend,
         .resume =       usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(eem_driver);
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index fffee6aee8b..a03de719704 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -705,6 +705,7 @@ static struct usb_driver cdc_driver = {
         .resume =       usbnet_resume,
         .reset_resume = usbnet_resume,
         .supports_autosuspend = 1,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(cdc_driver);
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 7adc9f6b0ea..4b9513fcf27 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1212,6 +1212,7 @@ static struct usb_driver cdc_ncm_driver = {
         .resume = usbnet_resume,
         .reset_resume = usbnet_resume,
         .supports_autosuspend = 1,
+        .disable_hub_initiated_lpm = 1,
 };
 
 static const struct ethtool_ops cdc_ncm_ethtool_ops = {
diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c
index b403d934e4e..0d1fe89ae0b 100644
--- a/drivers/net/usb/cdc_subset.c
+++ b/drivers/net/usb/cdc_subset.c
@@ -336,6 +336,7 @@ static struct usb_driver cdc_subset_driver = {
         .resume =       usbnet_resume,
         .disconnect =   usbnet_disconnect,
         .id_table =     products,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(cdc_subset_driver);
diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c
index 0e0531356e6..49ab45e17fe 100644
--- a/drivers/net/usb/cx82310_eth.c
+++ b/drivers/net/usb/cx82310_eth.c
@@ -327,6 +327,7 @@ static struct usb_driver cx82310_driver = {
         .disconnect     = usbnet_disconnect,
         .suspend        = usbnet_suspend,
         .resume         = usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(cx82310_driver);
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index b97226318ea..e0433ce6ced 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -670,6 +670,7 @@ static struct usb_driver dm9601_driver = {
         .disconnect = usbnet_disconnect,
         .suspend = usbnet_suspend,
         .resume = usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(dm9601_driver);
diff --git a/drivers/net/usb/gl620a.c b/drivers/net/usb/gl620a.c
index 38266bdae26..db3c8021f2a 100644
--- a/drivers/net/usb/gl620a.c
+++ b/drivers/net/usb/gl620a.c
@@ -225,6 +225,7 @@ static struct usb_driver gl620a_driver = {
         .disconnect =   usbnet_disconnect,
         .suspend =      usbnet_suspend,
         .resume =       usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(gl620a_driver);
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 2d2a6882ba3..042c1a99520 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -3291,6 +3291,7 @@ static struct usb_driver hso_driver = {
         .resume = hso_resume,
         .reset_resume = hso_resume,
         .supports_autosuspend = 1,
+        .disable_hub_initiated_lpm = 1,
 };
 
 static int __init hso_init(void)
diff --git a/drivers/net/usb/int51x1.c b/drivers/net/usb/int51x1.c
index 12a22a453ff..8de641713d5 100644
--- a/drivers/net/usb/int51x1.c
+++ b/drivers/net/usb/int51x1.c
@@ -236,6 +236,7 @@ static struct usb_driver int51x1_driver = {
         .disconnect = usbnet_disconnect,
         .suspend    = usbnet_suspend,
         .resume     = usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(int51x1_driver);
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index dd78c4cbd45..964031e3da8 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -209,7 +209,8 @@ static void ipheth_rcvbulk_callback(struct urb *urb)
         case 0:
                 break;
         default:
-                err("%s: urb status: %d", __func__, status);
+                dev_err(&dev->intf->dev, "%s: urb status: %d\n",
+                        __func__, status);
                 return;
         }
 
@@ -222,7 +223,8 @@ static void ipheth_rcvbulk_callback(struct urb *urb)
 
         skb = dev_alloc_skb(len);
         if (!skb) {
-                err("%s: dev_alloc_skb: -ENOMEM", __func__);
+                dev_err(&dev->intf->dev, "%s: dev_alloc_skb: -ENOMEM\n",
+                        __func__);
                 dev->net->stats.rx_dropped++;
                 return;
         }
@@ -251,7 +253,8 @@ static void ipheth_sndbulk_callback(struct urb *urb)
             status != -ENOENT &&
             status != -ECONNRESET &&
             status != -ESHUTDOWN)
-                err("%s: urb status: %d", __func__, status);
+                dev_err(&dev->intf->dev, "%s: urb status: %d\n",
+                __func__, status);
 
         dev_kfree_skb_irq(dev->tx_skb);
         netif_wake_queue(dev->net);
@@ -271,7 +274,8 @@ static int ipheth_carrier_set(struct ipheth_device *dev)
                         dev->ctrl_buf, IPHETH_CTRL_BUF_SIZE,
                         IPHETH_CTRL_TIMEOUT);
         if (retval < 0) {
-                err("%s: usb_control_msg: %d", __func__, retval);
+                dev_err(&dev->intf->dev, "%s: usb_control_msg: %d\n",
+                        __func__, retval);
                 return retval;
         }
 
@@ -308,9 +312,11 @@ static int ipheth_get_macaddr(struct ipheth_device *dev)
                                  IPHETH_CTRL_BUF_SIZE,
                                  IPHETH_CTRL_TIMEOUT);
         if (retval < 0) {
-                err("%s: usb_control_msg: %d", __func__, retval);
+                dev_err(&dev->intf->dev, "%s: usb_control_msg: %d\n",
+                        __func__, retval);
         } else if (retval < ETH_ALEN) {
-                err("%s: usb_control_msg: short packet: %d bytes",
+                dev_err(&dev->intf->dev,
+                        "%s: usb_control_msg: short packet: %d bytes\n",
                         __func__, retval);
                 retval = -EINVAL;
         } else {
@@ -335,7 +341,8 @@ static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags)
 
         retval = usb_submit_urb(dev->rx_urb, mem_flags);
         if (retval)
-                err("%s: usb_submit_urb: %d", __func__, retval);
+                dev_err(&dev->intf->dev, "%s: usb_submit_urb: %d\n",
+                        __func__, retval);
         return retval;
 }
 
@@ -396,7 +403,8 @@ static int ipheth_tx(struct sk_buff *skb, struct net_device *net)
 
         retval = usb_submit_urb(dev->tx_urb, GFP_ATOMIC);
         if (retval) {
-                err("%s: usb_submit_urb: %d", __func__, retval);
+                dev_err(&dev->intf->dev, "%s: usb_submit_urb: %d\n",
+                        __func__, retval);
                 dev->net->stats.tx_errors++;
                 dev_kfree_skb_irq(skb);
         } else {
@@ -414,7 +422,7 @@ static void ipheth_tx_timeout(struct net_device *net)
 {
         struct ipheth_device *dev = netdev_priv(net);
 
-        err("%s: TX timeout", __func__);
+        dev_err(&dev->intf->dev, "%s: TX timeout\n", __func__);
         dev->net->stats.tx_errors++;
         usb_unlink_urb(dev->tx_urb);
 }
@@ -464,7 +472,7 @@ static int ipheth_probe(struct usb_interface *intf,
         hintf = usb_altnum_to_altsetting(intf, IPHETH_ALT_INTFNUM);
         if (hintf == NULL) {
                 retval = -ENODEV;
-                err("Unable to find alternate settings interface");
+                dev_err(&intf->dev, "Unable to find alternate settings interface\n");
                 goto err_endpoints;
         }
 
@@ -477,7 +485,7 @@ static int ipheth_probe(struct usb_interface *intf,
         }
         if (!(dev->bulk_in && dev->bulk_out)) {
                 retval = -ENODEV;
-                err("Unable to find endpoints");
+                dev_err(&intf->dev, "Unable to find endpoints\n");
                 goto err_endpoints;
         }
 
@@ -495,7 +503,7 @@ static int ipheth_probe(struct usb_interface *intf,
 
         retval = ipheth_alloc_urbs(dev);
         if (retval) {
-                err("error allocating urbs: %d", retval);
+                dev_err(&intf->dev, "error allocating urbs: %d\n", retval);
                 goto err_alloc_urbs;
         }
 
@@ -506,7 +514,7 @@ static int ipheth_probe(struct usb_interface *intf,
 
         retval = register_netdev(netdev);
         if (retval) {
-                err("error registering netdev: %d", retval);
+                dev_err(&intf->dev, "error registering netdev: %d\n", retval);
                 retval = -EIO;
                 goto err_register_netdev;
         }
@@ -546,6 +554,7 @@ static struct usb_driver ipheth_driver = {
         .probe =        ipheth_probe,
         .disconnect =   ipheth_disconnect,
         .id_table =     ipheth_table,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(ipheth_driver);
diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
index 7562649b3d6..92c49e0a59e 100644
--- a/drivers/net/usb/kalmia.c
+++ b/drivers/net/usb/kalmia.c
@@ -372,7 +372,8 @@ static struct usb_driver kalmia_driver = {
         .probe = usbnet_probe,
         .disconnect = usbnet_disconnect,
         .suspend = usbnet_suspend,
-        .resume = usbnet_resume
+        .resume = usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(kalmia_driver);
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index df2a2cf35a9..d8ad5528438 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -179,6 +179,7 @@ static struct usb_driver kaweth_driver = {
         .resume =       kaweth_resume,
         .id_table =     usb_klsi_table,
         .supports_autosuspend = 1,
+        .disable_hub_initiated_lpm = 1,
 };
 
 typedef __u8 eth_addr_t[6];
@@ -400,12 +401,13 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
 
         ret = request_firmware(&fw, fwname, &kaweth->dev->dev);
         if (ret) {
-                err("Firmware request failed\n");
+                dev_err(&kaweth->intf->dev, "Firmware request failed\n");
                 return ret;
         }
 
         if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) {
-                err("Firmware too big: %zu", fw->size);
+                dev_err(&kaweth->intf->dev, "Firmware too big: %zu\n",
+                        fw->size);
                 release_firmware(fw);
                 return -ENOSPC;
         }
@@ -501,9 +503,10 @@ static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, gfp_t mf)
         }
 
         if (status)
-                err ("can't resubmit intr, %s-%s, status %d",
-                                kaweth->dev->bus->bus_name,
-                                kaweth->dev->devpath, status);
+                dev_err(&kaweth->intf->dev,
+                        "can't resubmit intr, %s-%s, status %d\n",
+                        kaweth->dev->bus->bus_name,
+                        kaweth->dev->devpath, status);
 }
 
 static void int_callback(struct urb *u)
@@ -576,7 +579,8 @@ static int kaweth_resubmit_rx_urb(struct kaweth_device *kaweth,
                         kaweth->suspend_lowmem_rx = 1;
                         schedule_delayed_work(&kaweth->lowmem_work, HZ/4);
                 }
-                err("resubmitting rx_urb %d failed", result);
+                dev_err(&kaweth->intf->dev, "resubmitting rx_urb %d failed\n",
+                        result);
         } else {
                 kaweth->suspend_lowmem_rx = 0;
         }
@@ -634,20 +638,21 @@ static void kaweth_usb_receive(struct urb *urb)
         spin_unlock(&kaweth->device_lock);
 
         if(status && status != -EREMOTEIO && count != 1) {
-                err("%s RX status: %d count: %d packet_len: %d",
-                           net->name,
-                           status,
-                           count,
-                           (int)pkt_len);
+                dev_err(&kaweth->intf->dev,
+                        "%s RX status: %d count: %d packet_len: %d\n",
+                        net->name, status, count, (int)pkt_len);
                 kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
                 return;
         }
 
         if(kaweth->net && (count > 2)) {
                 if(pkt_len > (count - 2)) {
-                        err("Packet length too long for USB frame (pkt_len: %x, count: %x)",pkt_len, count);
-                        err("Packet len & 2047: %x", pkt_len & 2047);
-                        err("Count 2: %x", count2);
+                        dev_err(&kaweth->intf->dev,
+                                "Packet length too long for USB frame (pkt_len: %x, count: %x)\n",
+                                pkt_len, count);
+                        dev_err(&kaweth->intf->dev, "Packet len & 2047: %x\n",
+                                pkt_len & 2047);
+                        dev_err(&kaweth->intf->dev, "Count 2: %x\n", count2);
                         kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
                         return;
                 }
@@ -686,7 +691,7 @@ static int kaweth_open(struct net_device *net)
 
         res = usb_autopm_get_interface(kaweth->intf);
         if (res) {
-                err("Interface cannot be resumed.");
+                dev_err(&kaweth->intf->dev, "Interface cannot be resumed.\n");
                 return -EIO;
         }
         res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL);
@@ -907,7 +912,8 @@ static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)
                                 KAWETH_CONTROL_TIMEOUT);
 
         if(result < 0) {
-                err("Failed to set Rx mode: %d", result);
+                dev_err(&kaweth->intf->dev, "Failed to set Rx mode: %d\n",
+                        result);
         }
         else {
                 dbg("Set Rx mode to %d", packet_filter_bitmap);
@@ -1045,7 +1051,8 @@ static int kaweth_probe(
                                                       "kaweth/new_code.bin",
                                                       100,
                                                       2)) < 0) {
-                        err("Error downloading firmware (%d)", result);
+                        dev_err(&intf->dev, "Error downloading firmware (%d)\n",
+                                result);
                         goto err_fw;
                 }
 
@@ -1053,7 +1060,9 @@ static int kaweth_probe(
                                                       "kaweth/new_code_fix.bin",
                                                       100,
                                                       3)) < 0) {
-                        err("Error downloading firmware fix (%d)", result);
+                        dev_err(&intf->dev,
+                                "Error downloading firmware fix (%d)\n",
+                                result);
                         goto err_fw;
                 }
 
@@ -1061,7 +1070,9 @@ static int kaweth_probe(
                                                       "kaweth/trigger_code.bin",
                                                       126,
                                                       2)) < 0) {
-                        err("Error downloading trigger code (%d)", result);
+                        dev_err(&intf->dev,
+                                "Error downloading trigger code (%d)\n",
+                                result);
                         goto err_fw;
 
                 }
@@ -1070,13 +1081,14 @@ static int kaweth_probe(
                                                       "kaweth/trigger_code_fix.bin",
                                                       126,
                                                       3)) < 0) {
-                        err("Error downloading trigger code fix (%d)", result);
+                        dev_err(&intf->dev, "Error downloading trigger code fix (%d)\n", result);
                         goto err_fw;
                 }
 
 
                 if ((result = kaweth_trigger_firmware(kaweth, 126)) < 0) {
-                        err("Error triggering firmware (%d)", result);
+                        dev_err(&intf->dev, "Error triggering firmware (%d)\n",
+                                result);
                         goto err_fw;
                 }
 
@@ -1091,7 +1103,7 @@ err_fw:
         result = kaweth_read_configuration(kaweth);
 
         if(result < 0) {
-                err("Error reading configuration (%d), no net device created", result);
+                dev_err(&intf->dev, "Error reading configuration (%d), no net device created\n", result);
                 goto err_free_netdev;
         }
 
@@ -1103,7 +1115,7 @@ err_fw:
         if(!memcmp(&kaweth->configuration.hw_addr,
                    &bcast_addr,
                    sizeof(bcast_addr))) {
-                err("Firmware not functioning properly, no net device created");
+                dev_err(&intf->dev, "Firmware not functioning properly, no net device created\n");
                 goto err_free_netdev;
         }
 
@@ -1113,7 +1125,7 @@ err_fw:
         }
 
         if(kaweth_set_sofs_wait(kaweth, KAWETH_SOFS_TO_WAIT) < 0) {
-                err("Error setting SOFS wait");
+                dev_err(&intf->dev, "Error setting SOFS wait\n");
                 goto err_free_netdev;
         }
 
@@ -1123,7 +1135,7 @@ err_fw:
                                            KAWETH_PACKET_FILTER_MULTICAST);
 
         if(result < 0) {
-                err("Error setting receive filter");
+                dev_err(&intf->dev, "Error setting receive filter\n");
                 goto err_free_netdev;
         }
 
@@ -1175,7 +1187,7 @@ err_fw:
 
         SET_NETDEV_DEV(netdev, &intf->dev);
         if (register_netdev(netdev) != 0) {
-                err("Error registering netdev.");
+                dev_err(&intf->dev, "Error registering netdev.\n");
                 goto err_intfdata;
         }
 
diff --git a/drivers/net/usb/lg-vl600.c b/drivers/net/usb/lg-vl600.c
index 45a981fde43..808d6506da4 100644
--- a/drivers/net/usb/lg-vl600.c
+++ b/drivers/net/usb/lg-vl600.c
@@ -344,6 +344,7 @@ static struct usb_driver lg_vl600_driver = {
         .disconnect     = usbnet_disconnect,
         .suspend        = usbnet_suspend,
         .resume         = usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(lg_vl600_driver);
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index c434b6ba033..add1064f755 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -690,6 +690,7 @@ static struct usb_driver mcs7830_driver = {
         .suspend = usbnet_suspend,
         .resume = usbnet_resume,
         .reset_resume = mcs7830_reset_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(mcs7830_driver);
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c
index 83f965cb69e..28c4d513ba8 100644
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
@@ -587,6 +587,7 @@ static struct usb_driver net1080_driver = {
         .disconnect =   usbnet_disconnect,
         .suspend =      usbnet_suspend,
         .resume =       usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(net1080_driver);
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 75239309232..7023220456c 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1489,6 +1489,7 @@ static struct usb_driver pegasus_driver = {
         .id_table = pegasus_ids,
         .suspend = pegasus_suspend,
         .resume = pegasus_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 static void __init parse_id(char *id)
diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c
index b2b035e2997..4584b9a805b 100644
--- a/drivers/net/usb/plusb.c
+++ b/drivers/net/usb/plusb.c
@@ -152,6 +152,7 @@ static struct usb_driver plusb_driver = {
         .disconnect =   usbnet_disconnect,
         .suspend =      usbnet_suspend,
         .resume =       usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(plusb_driver);
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 63cfd0b2c31..380dbea6109 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -560,6 +560,7 @@ static struct usb_driver qmi_wwan_driver = {
         .resume               = qmi_wwan_resume,
         .reset_resume         = qmi_wwan_resume,
         .supports_autosuspend = 1,
+        .disable_hub_initiated_lpm = 1,
 };
 
 static int __init qmi_wwan_init(void)
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 0d746b3fdef..4a4335833c3 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -638,6 +638,7 @@ static struct usb_driver rndis_driver = {
         .disconnect =   usbnet_disconnect,
         .suspend =      usbnet_suspend,
         .resume =       usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(rndis_driver);
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index d363b31053d..0e2c92e0e53 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -203,7 +203,8 @@ static int async_set_registers(rtl8150_t * dev, u16 indx, u16 size)
         if ((ret = usb_submit_urb(dev->ctrl_urb, GFP_ATOMIC))) {
                 if (ret == -ENODEV)
                         netif_device_detach(dev->netdev);
-                err("control request submission failed: %d", ret);
+                dev_err(&dev->udev->dev,
+                        "control request submission failed: %d\n", ret);
         } else
                 set_bit(RX_REG_SET, &dev->flags);
 
@@ -516,9 +517,9 @@ resubmit:
         if (res == -ENODEV)
                 netif_device_detach(dev->netdev);
         else if (res)
-                err ("can't resubmit intr, %s-%s/input0, status %d",
-                                dev->udev->bus->bus_name,
-                                dev->udev->devpath, res);
+                dev_err(&dev->udev->dev,
+                        "can't resubmit intr, %s-%s/input0, status %d\n",
+                        dev->udev->bus->bus_name, dev->udev->devpath, res);
 }
 
 static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message)
@@ -890,11 +891,11 @@ static int rtl8150_probe(struct usb_interface *intf,
         dev->intr_interval = 100;       /* 100ms */
 
         if (!alloc_all_urbs(dev)) {
-                err("out of memory");
+                dev_err(&intf->dev, "out of memory\n");
                 goto out;
         }
         if (!rtl8150_reset(dev)) {
-                err("couldn't reset the device");
+                dev_err(&intf->dev, "couldn't reset the device\n");
                 goto out1;
         }
         fill_skb_pool(dev);
@@ -903,7 +904,7 @@ static int rtl8150_probe(struct usb_interface *intf,
         usb_set_intfdata(intf, dev);
         SET_NETDEV_DEV(netdev, &intf->dev);
         if (register_netdev(netdev) != 0) {
-                err("couldn't register the device");
+                dev_err(&intf->dev, "couldn't register the device\n");
                 goto out2;
         }
 
@@ -947,7 +948,8 @@ static struct usb_driver rtl8150_driver = {
         .disconnect     = rtl8150_disconnect,
         .id_table       = rtl8150_table,
         .suspend        = rtl8150_suspend,
-        .resume         = rtl8150_resume
+        .resume         = rtl8150_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(rtl8150_driver);
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index b59cf20c781..3faef5670d1 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -982,6 +982,7 @@ static struct usb_driver sierra_net_driver = {
         .suspend = usbnet_suspend,
         .resume = usbnet_resume,
         .no_dynamic_id = 1,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(sierra_net_driver);
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index fb1a087b101..1c6e51588da 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -1254,6 +1254,7 @@ static struct usb_driver smsc75xx_driver = {
         .suspend        = usbnet_suspend,
         .resume         = usbnet_resume,
         .disconnect     = usbnet_disconnect,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(smsc75xx_driver);
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 94ae66999f5..b1112e75385 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1297,6 +1297,7 @@ static struct usb_driver smsc95xx_driver = {
         .suspend        = usbnet_suspend,
         .resume         = usbnet_resume,
         .disconnect     = usbnet_disconnect,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(smsc95xx_driver);
diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
index 34db195fb8b..35c90307d47 100644
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
@@ -377,6 +377,7 @@ static struct usb_driver zaurus_driver = {
         .disconnect =   usbnet_disconnect,
         .suspend =      usbnet_suspend,
         .resume =       usbnet_resume,
+        .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(zaurus_driver);