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

5 files changed, 77 insertions, 50 deletions

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 72f687b40d66..f9a86bdb12fa 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1671,7 +1671,7 @@ static int irda_usb_probe(struct usb_interface *intf,
 
         /* Is this really necessary? (no, except maybe for broken devices) */
         if (usb_reset_configuration (dev) < 0) {
-                err("reset_configuration failed");
+                dev_err(&intf->dev, "reset_configuration failed\n");
                 ret = -EIO;
                 goto err_out_3;
         }
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index 79aebeee928c..7b4833874ef5 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -134,14 +134,16 @@ static void kingsun_send_irq(struct urb *urb)
 
         /* in process of stopping, just drop data */
         if (!netif_running(kingsun->netdev)) {
-                err("kingsun_send_irq: Network not running!");
+                dev_err(&kingsun->usbdev->dev,
+                        "kingsun_send_irq: Network not running!\n");
                 return;
         }
 
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("kingsun_send_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&kingsun->usbdev->dev,
+                        "kingsun_send_irq: urb asynchronously failed - %d\n",
+                        urb->status);
         }
         netif_wake_queue(netdev);
 }
@@ -177,7 +179,8 @@ static netdev_tx_t kingsun_hard_xmit(struct sk_buff *skb,
                 kingsun, 1);
 
         if ((ret = usb_submit_urb(kingsun->tx_urb, GFP_ATOMIC))) {
-                err("kingsun_hard_xmit: failed tx_urb submit: %d", ret);
+                dev_err(&kingsun->usbdev->dev,
+                        "kingsun_hard_xmit: failed tx_urb submit: %d\n", ret);
                 switch (ret) {
                 case -ENODEV:
                 case -EPIPE:
@@ -211,8 +214,9 @@ static void kingsun_rcv_irq(struct urb *urb)
 
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("kingsun_rcv_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&kingsun->usbdev->dev,
+                        "kingsun_rcv_irq: urb asynchronously failed - %d\n",
+                        urb->status);
                 kingsun->receiving = 0;
                 return;
         }
@@ -238,8 +242,9 @@ static void kingsun_rcv_irq(struct urb *urb)
                                 ? 1 : 0;
                 }
         } else if (urb->actual_length > 0) {
-                err("%s(): Unexpected response length, expected %d got %d",
-                    __func__, kingsun->max_rx, urb->actual_length);
+                dev_err(&kingsun->usbdev->dev,
+                        "%s(): Unexpected response length, expected %d got %d\n",
+                        __func__, kingsun->max_rx, urb->actual_length);
         }
         /* This urb has already been filled in kingsun_net_open */
         ret = usb_submit_urb(urb, GFP_ATOMIC);
@@ -286,7 +291,7 @@ static int kingsun_net_open(struct net_device *netdev)
         sprintf(hwname, "usb#%d", kingsun->usbdev->devnum);
         kingsun->irlap = irlap_open(netdev, &kingsun->qos, hwname);
         if (!kingsun->irlap) {
-                err("kingsun-sir: irlap_open failed");
+                dev_err(&kingsun->usbdev->dev, "irlap_open failed\n");
                 goto free_mem;
         }
 
@@ -298,7 +303,8 @@ static int kingsun_net_open(struct net_device *netdev)
         kingsun->rx_urb->status = 0;
         err = usb_submit_urb(kingsun->rx_urb, GFP_KERNEL);
         if (err) {
-                err("kingsun-sir: first urb-submit failed: %d", err);
+                dev_err(&kingsun->usbdev->dev,
+                        "first urb-submit failed: %d\n", err);
                 goto close_irlap;
         }
 
@@ -446,13 +452,15 @@ static int kingsun_probe(struct usb_interface *intf,
          */
         interface = intf->cur_altsetting;
         if (interface->desc.bNumEndpoints != 2) {
-                err("kingsun-sir: expected 2 endpoints, found %d",
-                    interface->desc.bNumEndpoints);
+                dev_err(&intf->dev,
+                        "kingsun-sir: expected 2 endpoints, found %d\n",
+                        interface->desc.bNumEndpoints);
                 return -ENODEV;
         }
         endpoint = &interface->endpoint[KINGSUN_EP_IN].desc;
         if (!usb_endpoint_is_int_in(endpoint)) {
-                err("kingsun-sir: endpoint 0 is not interrupt IN");
+                dev_err(&intf->dev,
+                        "kingsun-sir: endpoint 0 is not interrupt IN\n");
                 return -ENODEV;
         }
 
@@ -460,14 +468,16 @@ static int kingsun_probe(struct usb_interface *intf,
         pipe = usb_rcvintpipe(dev, ep_in);
         maxp_in = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
         if (maxp_in > 255 || maxp_in <= 1) {
-                err("%s: endpoint 0 has max packet size %d not in range",
-                    __FILE__, maxp_in);
+                dev_err(&intf->dev,
+                        "endpoint 0 has max packet size %d not in range\n",
+                        maxp_in);
                 return -ENODEV;
         }
 
         endpoint = &interface->endpoint[KINGSUN_EP_OUT].desc;
         if (!usb_endpoint_is_int_out(endpoint)) {
-                err("kingsun-sir: endpoint 1 is not interrupt OUT");
+                dev_err(&intf->dev,
+                        "kingsun-sir: endpoint 1 is not interrupt OUT\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index abe689dffc72..824e2a93fe8a 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -247,8 +247,9 @@ static void ks959_speed_irq(struct urb *urb)
 {
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("ks959_speed_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&urb->dev->dev,
+                        "ks959_speed_irq: urb asynchronously failed - %d\n",
+                        urb->status);
         }
 }
 
@@ -332,14 +333,16 @@ static void ks959_send_irq(struct urb *urb)
 
         /* in process of stopping, just drop data */
         if (!netif_running(kingsun->netdev)) {
-                err("ks959_send_irq: Network not running!");
+                dev_err(&kingsun->usbdev->dev,
+                        "ks959_send_irq: Network not running!\n");
                 return;
         }
 
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("ks959_send_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&kingsun->usbdev->dev,
+                        "ks959_send_irq: urb asynchronously failed - %d\n",
+                        urb->status);
                 return;
         }
 
@@ -358,8 +361,9 @@ static void ks959_send_irq(struct urb *urb)
                 if (kingsun->tx_buf_clear_used > 0) {
                         /* There is more data to be sent */
                         if ((ret = ks959_submit_tx_fragment(kingsun)) != 0) {
-                                err("ks959_send_irq: failed tx_urb submit: %d",
-                                    ret);
+                                dev_err(&kingsun->usbdev->dev,
+                                        "ks959_send_irq: failed tx_urb submit: %d\n",
+                                        ret);
                                 switch (ret) {
                                 case -ENODEV:
                                 case -EPIPE:
@@ -407,7 +411,8 @@ static netdev_tx_t ks959_hard_xmit(struct sk_buff *skb,
         kingsun->tx_buf_clear_used = wraplen;
 
         if ((ret = ks959_submit_tx_fragment(kingsun)) != 0) {
-                err("ks959_hard_xmit: failed tx_urb submit: %d", ret);
+                dev_err(&kingsun->usbdev->dev,
+                        "ks959_hard_xmit: failed tx_urb submit: %d\n", ret);
                 switch (ret) {
                 case -ENODEV:
                 case -EPIPE:
@@ -442,8 +447,9 @@ static void ks959_rcv_irq(struct urb *urb)
 
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("kingsun_rcv_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&kingsun->usbdev->dev,
+                        "kingsun_rcv_irq: urb asynchronously failed - %d\n",
+                        urb->status);
                 kingsun->receiving = 0;
                 return;
         }
@@ -536,7 +542,7 @@ static int ks959_net_open(struct net_device *netdev)
         sprintf(hwname, "usb#%d", kingsun->usbdev->devnum);
         kingsun->irlap = irlap_open(netdev, &kingsun->qos, hwname);
         if (!kingsun->irlap) {
-                err("ks959-sir: irlap_open failed");
+                dev_err(&kingsun->usbdev->dev, "irlap_open failed\n");
                 goto free_mem;
         }
 
@@ -549,7 +555,8 @@ static int ks959_net_open(struct net_device *netdev)
         kingsun->rx_urb->status = 0;
         err = usb_submit_urb(kingsun->rx_urb, GFP_KERNEL);
         if (err) {
-                err("ks959-sir: first urb-submit failed: %d", err);
+                dev_err(&kingsun->usbdev->dev,
+                        "first urb-submit failed: %d\n", err);
                 goto close_irlap;
         }
 
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index f8c01088eeb7..5a278ab83c2f 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -168,10 +168,10 @@ struct ksdazzle_cb {
 static void ksdazzle_speed_irq(struct urb *urb)
 {
         /* unlink, shutdown, unplug, other nasties */
-        if (urb->status != 0) {
-                err("ksdazzle_speed_irq: urb asynchronously failed - %d",
-                    urb->status);
-        }
+        if (urb->status != 0)
+                dev_err(&urb->dev->dev,
+                        "ksdazzle_speed_irq: urb asynchronously failed - %d\n",
+                        urb->status);
 }
 
 /* Send a control request to change speed of the dongle */
@@ -245,14 +245,16 @@ static void ksdazzle_send_irq(struct urb *urb)
 
         /* in process of stopping, just drop data */
         if (!netif_running(kingsun->netdev)) {
-                err("ksdazzle_send_irq: Network not running!");
+                dev_err(&kingsun->usbdev->dev,
+                        "ksdazzle_send_irq: Network not running!\n");
                 return;
         }
 
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("ksdazzle_send_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&kingsun->usbdev->dev,
+                        "ksdazzle_send_irq: urb asynchronously failed - %d\n",
+                        urb->status);
                 return;
         }
 
@@ -271,7 +273,9 @@ static void ksdazzle_send_irq(struct urb *urb)
                 if (kingsun->tx_buf_clear_used > 0) {
                         /* There is more data to be sent */
                         if ((ret = ksdazzle_submit_tx_fragment(kingsun)) != 0) {
-                                err("ksdazzle_send_irq: failed tx_urb submit: %d", ret);
+                                dev_err(&kingsun->usbdev->dev,
+                                        "ksdazzle_send_irq: failed tx_urb submit: %d\n",
+                                        ret);
                                 switch (ret) {
                                 case -ENODEV:
                                 case -EPIPE:
@@ -320,7 +324,8 @@ static netdev_tx_t ksdazzle_hard_xmit(struct sk_buff *skb,
         kingsun->tx_buf_clear_used = wraplen;
 
         if ((ret = ksdazzle_submit_tx_fragment(kingsun)) != 0) {
-                err("ksdazzle_hard_xmit: failed tx_urb submit: %d", ret);
+                dev_err(&kingsun->usbdev->dev,
+                        "ksdazzle_hard_xmit: failed tx_urb submit: %d\n", ret);
                 switch (ret) {
                 case -ENODEV:
                 case -EPIPE:
@@ -355,8 +360,9 @@ static void ksdazzle_rcv_irq(struct urb *urb)
 
         /* unlink, shutdown, unplug, other nasties */
         if (urb->status != 0) {
-                err("ksdazzle_rcv_irq: urb asynchronously failed - %d",
-                    urb->status);
+                dev_err(&kingsun->usbdev->dev,
+                        "ksdazzle_rcv_irq: urb asynchronously failed - %d\n",
+                        urb->status);
                 kingsun->receiving = 0;
                 return;
         }
@@ -430,7 +436,7 @@ static int ksdazzle_net_open(struct net_device *netdev)
         sprintf(hwname, "usb#%d", kingsun->usbdev->devnum);
         kingsun->irlap = irlap_open(netdev, &kingsun->qos, hwname);
         if (!kingsun->irlap) {
-                err("ksdazzle-sir: irlap_open failed");
+                dev_err(&kingsun->usbdev->dev, "irlap_open failed\n");
                 goto free_mem;
         }
 
@@ -442,7 +448,7 @@ static int ksdazzle_net_open(struct net_device *netdev)
         kingsun->rx_urb->status = 0;
         err = usb_submit_urb(kingsun->rx_urb, GFP_KERNEL);
         if (err) {
-                err("ksdazzle-sir: first urb-submit failed: %d", err);
+                dev_err(&kingsun->usbdev->dev, "first urb-submit failed: %d\n", err);
                 goto close_irlap;
         }
 
@@ -590,13 +596,14 @@ static int ksdazzle_probe(struct usb_interface *intf,
          */
         interface = intf->cur_altsetting;
         if (interface->desc.bNumEndpoints != 2) {
-                err("ksdazzle: expected 2 endpoints, found %d",
-                    interface->desc.bNumEndpoints);
+                dev_err(&intf->dev, "ksdazzle: expected 2 endpoints, found %d\n",
+                        interface->desc.bNumEndpoints);
                 return -ENODEV;
         }
         endpoint = &interface->endpoint[KINGSUN_EP_IN].desc;
         if (!usb_endpoint_is_int_in(endpoint)) {
-                err("ksdazzle: endpoint 0 is not interrupt IN");
+                dev_err(&intf->dev,
+                        "ksdazzle: endpoint 0 is not interrupt IN\n");
                 return -ENODEV;
         }
 
@@ -604,13 +611,16 @@ static int ksdazzle_probe(struct usb_interface *intf,
         pipe = usb_rcvintpipe(dev, ep_in);
         maxp_in = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
         if (maxp_in > 255 || maxp_in <= 1) {
-                err("ksdazzle: endpoint 0 has max packet size %d not in range [2..255]", maxp_in);
+                dev_err(&intf->dev,
+                        "ksdazzle: endpoint 0 has max packet size %d not in range [2..255]\n",
+                        maxp_in);
                 return -ENODEV;
         }
 
         endpoint = &interface->endpoint[KINGSUN_EP_OUT].desc;
         if (!usb_endpoint_is_int_out(endpoint)) {
-                err("ksdazzle: endpoint 1 is not interrupt OUT");
+                dev_err(&intf->dev,
+                        "ksdazzle: endpoint 1 is not interrupt OUT\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index e6e59a078ef4..876e709b65ba 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -904,7 +904,7 @@ static int stir_net_open(struct net_device *netdev)
         sprintf(hwname, "usb#%d", stir->usbdev->devnum);
         stir->irlap = irlap_open(netdev, &stir->qos, hwname);
         if (!stir->irlap) {
-                err("stir4200: irlap_open failed");
+                dev_err(&stir->usbdev->dev, "irlap_open failed\n");
                 goto err_out5;
         }
 
@@ -913,7 +913,7 @@ static int stir_net_open(struct net_device *netdev)
                                    "%s", stir->netdev->name);
         if (IS_ERR(stir->thread)) {
                 err = PTR_ERR(stir->thread);
-                err("stir4200: unable to start kernel thread");
+                dev_err(&stir->usbdev->dev, "unable to start kernel thread\n");
                 goto err_out6;
         }
 
@@ -1042,7 +1042,7 @@ static int stir_probe(struct usb_interface *intf,
 
         ret = usb_reset_configuration(dev);
         if (ret != 0) {
-                err("stir4200: usb reset configuration failed");
+                dev_err(&intf->dev, "usb reset configuration failed\n");
                 goto err_out2;
         }