Merge tag 'for-usb-next-2013-08-27-15-07' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next

Sarah writes:

xhci: Fix build breakage and new warnings.

Hi Greg,

This first patch should fix the build breakage Sedat Dilek reported.
Apologizes for not including this patch before commit
0730d52a86919300a39a2be37f6c140997dfb82f "xhci:prevent "callbacks suppressed"
when debug is not enabled"

The second patch fixes a new build warning introduced by commit
c8476fb855434c733099079063990e5bfa7ecad6 "usb: xhci: Disable runtime PM suspend
for quirky controllers", which was caught by the 0day build system.

Sarah Sharp

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 349d3460a17a..49b6edb84a79 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3557,7 +3557,6 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
 {
         struct xhci_hcd *xhci = hcd_to_xhci(hcd);
         struct xhci_virt_device *virt_dev;
-        struct device *dev = hcd->self.controller;
         unsigned long flags;
         u32 state;
         int i, ret;
@@ -3569,7 +3568,7 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
          * if no devices remain.
          */
         if (xhci->quirks & XHCI_RESET_ON_RESUME)
-                pm_runtime_put_noidle(dev);
+                pm_runtime_put_noidle(hcd->self.controller);
 #endif
 
         ret = xhci_check_args(hcd, udev, NULL, 0, true, __func__);
@@ -3645,7 +3644,6 @@ static int xhci_reserve_host_control_ep_resources(struct xhci_hcd *xhci)
 int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
 {
         struct xhci_hcd *xhci = hcd_to_xhci(hcd);
-        struct device *dev = hcd->self.controller;
         unsigned long flags;
         int timeleft;
         int ret;
@@ -3705,7 +3703,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
          * suspend if there is a device attached.
          */
         if (xhci->quirks & XHCI_RESET_ON_RESUME)
-                pm_runtime_get_noresume(dev);
+                pm_runtime_get_noresume(hcd->self.controller);
 #endif
 
         /* Is this a LS or FS device under a HS hub? */