Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff49896a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for-usb-next-2013-08-27-15-07' of... 

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
0730d52a "xhci:prevent "callbacks suppressed"
when debug is not enabled"

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

Sarah Sharp
parents 69820e01 e7ecf069

drivers/usb/host/xhci.c

+2 −4
Original line number Diff line number Diff line
@@ -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? */

include/linux/device.h

+13 −3
Original line number Diff line number Diff line
@@ -1099,7 +1099,8 @@ do { \ 
	dev_level_ratelimited(dev_notice, dev, fmt, ##__VA_ARGS__)

#define dev_info_ratelimited(dev, fmt, ...)				\

	dev_level_ratelimited(dev_info, dev, fmt, ##__VA_ARGS__)

#if defined(CONFIG_DYNAMIC_DEBUG) || defined(DEBUG)

#if defined(CONFIG_DYNAMIC_DEBUG)

/* descriptor check is first to prevent flooding with "callbacks suppressed" */

#define dev_dbg_ratelimited(dev, fmt, ...)				\

do {									\

	static DEFINE_RATELIMIT_STATE(_rs,				\
@@ -1108,9 +1109,18 @@ do { \ 
	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);			\

	if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) &&	\

	    __ratelimit(&_rs))						\

		__dynamic_pr_debug(&descriptor, pr_fmt(fmt),		\

		__dynamic_dev_dbg(&descriptor, dev, fmt,		\

				  ##__VA_ARGS__);			\

} while (0)

#elif defined(DEBUG)

#define dev_dbg_ratelimited(dev, fmt, ...)				\

do {									\

	static DEFINE_RATELIMIT_STATE(_rs,				\

				      DEFAULT_RATELIMIT_INTERVAL,	\

				      DEFAULT_RATELIMIT_BURST);		\

	if (__ratelimit(&_rs))						\

		dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__);	\

} while (0)

#else

#define dev_dbg_ratelimited(dev, fmt, ...)			\

	no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)