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

4 files changed, 66 insertions, 34 deletions

diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index ab860511f01..082684e7f39 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -327,7 +327,9 @@ static void cm109_submit_buzz_toggle(struct cm109_dev *dev)
 
         error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC);
         if (error)
-                err("%s: usb_submit_urb (urb_ctl) failed %d", __func__, error);
+                dev_err(&dev->intf->dev,
+                        "%s: usb_submit_urb (urb_ctl) failed %d\n",
+                        __func__, error);
 }
 
 /*
@@ -339,7 +341,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
         const int status = urb->status;
         int error;
 
-        dev_dbg(&urb->dev->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n",
+        dev_dbg(&dev->intf->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n",
              dev->irq_data->byte[0],
              dev->irq_data->byte[1],
              dev->irq_data->byte[2],
@@ -349,7 +351,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
         if (status) {
                 if (status == -ESHUTDOWN)
                         return;
-                err("%s: urb status %d", __func__, status);
+                dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status);
         }
 
         /* Special keys */
@@ -396,7 +398,8 @@ static void cm109_urb_irq_callback(struct urb *urb)
 
                 error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC);
                 if (error)
-                        err("%s: usb_submit_urb (urb_ctl) failed %d",
+                        dev_err(&dev->intf->dev,
+                                "%s: usb_submit_urb (urb_ctl) failed %d\n",
                                 __func__, error);
         }
 
@@ -409,14 +412,14 @@ static void cm109_urb_ctl_callback(struct urb *urb)
         const int status = urb->status;
         int error;
 
-        dev_dbg(&urb->dev->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n",
+        dev_dbg(&dev->intf->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n",
              dev->ctl_data->byte[0],
              dev->ctl_data->byte[1],
              dev->ctl_data->byte[2],
              dev->ctl_data->byte[3]);
 
         if (status)
-                err("%s: urb status %d", __func__, status);
+                dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status);
 
         spin_lock(&dev->ctl_submit_lock);
 
@@ -433,7 +436,8 @@ static void cm109_urb_ctl_callback(struct urb *urb)
                         dev->irq_urb_pending = 1;
                         error = usb_submit_urb(dev->urb_irq, GFP_ATOMIC);
                         if (error)
-                                err("%s: usb_submit_urb (urb_irq) failed %d",
+                                dev_err(&dev->intf->dev,
+                                        "%s: usb_submit_urb (urb_irq) failed %d\n",
                                         __func__, error);
                 }
         }
@@ -476,7 +480,8 @@ static void cm109_toggle_buzzer_sync(struct cm109_dev *dev, int on)
                                 dev->ctl_data,
                                 USB_PKT_LEN, USB_CTRL_SET_TIMEOUT);
         if (error < 0 && error != -EINTR)
-                err("%s: usb_control_msg() failed %d", __func__, error);
+                dev_err(&dev->intf->dev, "%s: usb_control_msg() failed %d\n",
+                        __func__, error);
 }
 
 static void cm109_stop_traffic(struct cm109_dev *dev)
@@ -518,8 +523,8 @@ static int cm109_input_open(struct input_dev *idev)
 
         error = usb_autopm_get_interface(dev->intf);
         if (error < 0) {
-                err("%s - cannot autoresume, result %d",
-                    __func__, error);
+                dev_err(&idev->dev, "%s - cannot autoresume, result %d\n",
+                        __func__, error);
                 return error;
         }
 
@@ -537,7 +542,8 @@ static int cm109_input_open(struct input_dev *idev)
 
         error = usb_submit_urb(dev->urb_ctl, GFP_KERNEL);
         if (error)
-                err("%s: usb_submit_urb (urb_ctl) failed %d", __func__, error);
+                dev_err(&dev->intf->dev, "%s: usb_submit_urb (urb_ctl) failed %d\n",
+                        __func__, error);
         else
                 dev->open = 1;
 
@@ -573,7 +579,7 @@ static int cm109_input_ev(struct input_dev *idev, unsigned int type,
 {
         struct cm109_dev *dev = input_get_drvdata(idev);
 
-        dev_dbg(&dev->udev->dev,
+        dev_dbg(&dev->intf->dev,
                 "input_ev: type=%u code=%u value=%d\n", type, code, value);
 
         if (type != EV_SND)
@@ -710,7 +716,8 @@ static int cm109_usb_probe(struct usb_interface *intf,
         pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
         ret = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
         if (ret != USB_PKT_LEN)
-                err("invalid payload size %d, expected %d", ret, USB_PKT_LEN);
+                dev_err(&intf->dev, "invalid payload size %d, expected %d\n",
+                        ret, USB_PKT_LEN);
 
         /* initialise irq urb */
         usb_fill_int_urb(dev->urb_irq, udev, pipe, dev->irq_data,
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index d99151a8bf1..290fa5f97de 100644
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -157,7 +157,7 @@ static int keyspan_load_tester(struct usb_keyspan* dev, int bits_needed)
          * though so it's not too big a deal
          */
         if (dev->data.pos >= dev->data.len) {
-                dev_dbg(&dev->udev->dev,
+                dev_dbg(&dev->interface->dev,
                         "%s - Error ran out of data. pos: %d, len: %d\n",
                         __func__, dev->data.pos, dev->data.len);
                 return -1;
@@ -267,7 +267,9 @@ static void keyspan_check_data(struct usb_keyspan *remote)
                                 remote->data.tester = remote->data.tester >> 6;
                                 remote->data.bits_left -= 6;
                         } else {
-                                err("%s - Unknown sequence found in system data.\n", __func__);
+                                dev_err(&remote->interface->dev,
+                                        "%s - Unknown sequence found in system data.\n",
+                                        __func__);
                                 remote->stage = 0;
                                 return;
                         }
@@ -286,7 +288,9 @@ static void keyspan_check_data(struct usb_keyspan *remote)
                                 remote->data.tester = remote->data.tester >> 6;
                                 remote->data.bits_left -= 6;
                         } else {
-                                err("%s - Unknown sequence found in button data.\n", __func__);
+                                dev_err(&remote->interface->dev,
+                                        "%s - Unknown sequence found in button data.\n",
+                                        __func__);
                                 remote->stage = 0;
                                 return;
                         }
@@ -302,7 +306,9 @@ static void keyspan_check_data(struct usb_keyspan *remote)
                         remote->data.tester = remote->data.tester >> 6;
                         remote->data.bits_left -= 6;
                 } else {
-                        err("%s - Error in message, invalid toggle.\n", __func__);
+                        dev_err(&remote->interface->dev,
+                                "%s - Error in message, invalid toggle.\n",
+                                __func__);
                         remote->stage = 0;
                         return;
                 }
@@ -312,10 +318,11 @@ static void keyspan_check_data(struct usb_keyspan *remote)
                         remote->data.tester = remote->data.tester >> 5;
                         remote->data.bits_left -= 5;
                 } else {
-                        err("Bad message received, no stop bit found.\n");
+                        dev_err(&remote->interface->dev,
+                                "Bad message received, no stop bit found.\n");
                 }
 
-                dev_dbg(&remote->udev->dev,
+                dev_dbg(&remote->interface->dev,
                         "%s found valid message: system: %d, button: %d, toggle: %d\n",
                         __func__, message.system, message.button, message.toggle);
 
@@ -397,7 +404,9 @@ static void keyspan_irq_recv(struct urb *urb)
 resubmit:
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
-                err ("%s - usb_submit_urb failed with result: %d", __func__, retval);
+                dev_err(&dev->interface->dev,
+                        "%s - usb_submit_urb failed with result: %d\n",
+                        __func__, retval);
 }
 
 static int keyspan_open(struct input_dev *dev)
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index 538f7049ec6..49c0c3ebd32 100644
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -65,6 +65,7 @@ struct powermate_device {
         struct urb *irq, *config;
         struct usb_ctrlrequest *configcr;
         struct usb_device *udev;
+        struct usb_interface *intf;
         struct input_dev *input;
         spinlock_t lock;
         int static_brightness;
@@ -85,6 +86,7 @@ static void powermate_config_complete(struct urb *urb);
 static void powermate_irq(struct urb *urb)
 {
         struct powermate_device *pm = urb->context;
+        struct device *dev = &pm->intf->dev;
         int retval;
 
         switch (urb->status) {
@@ -95,10 +97,12 @@ static void powermate_irq(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d", __func__, urb->status);
+                dev_dbg(dev, "%s - urb shutting down with status: %d\n",
+                        __func__, urb->status);
                 return;
         default:
-                dbg("%s - nonzero urb status received: %d", __func__, urb->status);
+                dev_dbg(dev, "%s - nonzero urb status received: %d\n",
+                        __func__, urb->status);
                 goto exit;
         }
 
@@ -110,8 +114,8 @@ static void powermate_irq(struct urb *urb)
 exit:
         retval = usb_submit_urb (urb, GFP_ATOMIC);
         if (retval)
-                err ("%s - usb_submit_urb failed with result %d",
-                     __func__, retval);
+                dev_err(dev, "%s - usb_submit_urb failed with result: %d\n",
+                        __func__, retval);
 }
 
 /* Decide if we need to issue a control message and do so. Must be called with pm->lock taken */
@@ -330,6 +334,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
                 goto fail3;
 
         pm->udev = udev;
+        pm->intf = intf;
         pm->input = input_dev;
 
         usb_make_path(udev, pm->phys, sizeof(pm->phys));
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index f4776e7f8c1..285a5bd6cbc 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -101,6 +101,7 @@ static const struct lcd_segment_map {
 struct yealink_dev {
         struct input_dev *idev;         /* input device */
         struct usb_device *udev;        /* usb device */
+        struct usb_interface *intf;     /* usb interface */
 
         /* irq input channel */
         struct yld_ctl_packet   *irq_data;
@@ -428,7 +429,8 @@ static void urb_irq_callback(struct urb *urb)
         int ret, status = urb->status;
 
         if (status)
-                err("%s - urb status %d", __func__, status);
+                dev_err(&yld->intf->dev, "%s - urb status %d\n",
+                        __func__, status);
 
         switch (yld->irq_data->cmd) {
         case CMD_KEYPRESS:
@@ -437,13 +439,15 @@ static void urb_irq_callback(struct urb *urb)
                 break;
 
         case CMD_SCANCODE:
-                dbg("get scancode %x", yld->irq_data->data[0]);
+                dev_dbg(&yld->intf->dev, "get scancode %x\n",
+                        yld->irq_data->data[0]);
 
                 report_key(yld, map_p1k_to_key(yld->irq_data->data[0]));
                 break;
 
         default:
-                err("unexpected response %x", yld->irq_data->cmd);
+                dev_err(&yld->intf->dev, "unexpected response %x\n",
+                        yld->irq_data->cmd);
         }
 
         yealink_do_idle_tasks(yld);
@@ -451,7 +455,9 @@ static void urb_irq_callback(struct urb *urb)
         if (!yld->shutdown) {
                 ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
                 if (ret && ret != -EPERM)
-                        err("%s - usb_submit_urb failed %d", __func__, ret);
+                        dev_err(&yld->intf->dev,
+                                "%s - usb_submit_urb failed %d\n",
+                                __func__, ret);
         }
 }
 
@@ -461,7 +467,8 @@ static void urb_ctl_callback(struct urb *urb)
         int ret = 0, status = urb->status;
 
         if (status)
-                err("%s - urb status %d", __func__, status);
+                dev_err(&yld->intf->dev, "%s - urb status %d\n",
+                        __func__, status);
 
         switch (yld->ctl_data->cmd) {
         case CMD_KEYPRESS:
@@ -479,7 +486,8 @@ static void urb_ctl_callback(struct urb *urb)
         }
 
         if (ret && ret != -EPERM)
-                err("%s - usb_submit_urb failed %d", __func__, ret);
+                dev_err(&yld->intf->dev, "%s - usb_submit_urb failed %d\n",
+                        __func__, ret);
 }
 
 /*******************************************************************************
@@ -511,7 +519,7 @@ static int input_open(struct input_dev *dev)
         struct yealink_dev *yld = input_get_drvdata(dev);
         int i, ret;
 
-        dbg("%s", __func__);
+        dev_dbg(&yld->intf->dev, "%s\n", __func__);
 
         /* force updates to device */
         for (i = 0; i<sizeof(yld->master); i++)
@@ -526,8 +534,9 @@ static int input_open(struct input_dev *dev)
         yld->ctl_data->size     = 10;
         yld->ctl_data->sum      = 0x100-CMD_INIT-10;
         if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) {
-                dbg("%s - usb_submit_urb failed with result %d",
-                     __func__, ret);
+                dev_dbg(&yld->intf->dev,
+                        "%s - usb_submit_urb failed with result %d\n",
+                        __func__, ret);
                 return ret;
         }
         return 0;
@@ -876,6 +885,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 return -ENOMEM;
 
         yld->udev = udev;
+        yld->intf = intf;
 
         yld->idev = input_dev = input_allocate_device();
         if (!input_dev)
@@ -909,7 +919,8 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
         ret = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
         if (ret != USB_PKT_LEN)
-                err("invalid payload size %d, expected %zd", ret, USB_PKT_LEN);
+                dev_err(&intf->dev, "invalid payload size %d, expected %zd\n",
+                        ret, USB_PKT_LEN);
 
         /* initialise irq urb */
         usb_fill_int_urb(yld->urb_irq, udev, pipe, yld->irq_data,