Hi,
On Tuesday, September 27, 2011, Alan Stern wrote:
> This patch (as1487) improves the usbcore debugging output for port
> suspend and bus suspend, by stating whether or not remote wakeup is
> enabled.
>
> Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
>
> ---
>
> Rafael:
>
> This patch is based on the one adding the PMSG_IS_AUTO macro, which got
> merged through your tree and not Greg's. If I were to rebase this on
> top of Greg's tree, it would cause a merge conflict down the line, so
> he suggested it get merged into your tree.
>
> Is this okay with you?
Sure, no problem.
Thanks,
Rafael
> drivers/usb/core/hcd.c | 9 +++++----
> drivers/usb/core/hub.c | 7 +++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> Index: usb-3.1/drivers/usb/core/hcd.c
> ===================================================================
> --- usb-3.1.orig/drivers/usb/core/hcd.c
> +++ usb-3.1/drivers/usb/core/hcd.c
> @@ -1961,8 +1961,9 @@ int hcd_bus_suspend(struct usb_device *r
> int status;
> int old_state = hcd->state;
>
> - dev_dbg(&rhdev->dev, "bus %s%s\n",
> - (PMSG_IS_AUTO(msg) ? "auto-" : ""), "suspend");
> + dev_dbg(&rhdev->dev, "bus %ssuspend, wakeup %d\n",
> + (PMSG_IS_AUTO(msg) ? "auto-" : ""),
> + rhdev->do_remote_wakeup);
> if (HCD_DEAD(hcd)) {
> dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "suspend");
> return 0;
> @@ -1997,8 +1998,8 @@ int hcd_bus_resume(struct usb_device *rh
> int status;
> int old_state = hcd->state;
>
> - dev_dbg(&rhdev->dev, "usb %s%s\n",
> - (PMSG_IS_AUTO(msg) ? "auto-" : ""), "resume");
> + dev_dbg(&rhdev->dev, "usb %sresume\n",
> + (PMSG_IS_AUTO(msg) ? "auto-" : ""));
> if (HCD_DEAD(hcd)) {
> dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "resume");
> return 0;
> Index: usb-3.1/drivers/usb/core/hub.c
> ===================================================================
> --- usb-3.1.orig/drivers/usb/core/hub.c
> +++ usb-3.1/drivers/usb/core/hub.c
> @@ -2319,8 +2319,6 @@ int usb_port_suspend(struct usb_device *
> int port1 = udev->portnum;
> int status;
>
> - // dev_dbg(hub->intfdev, "suspend port %d\n", port1);
> -
> /* enable remote wakeup when appropriate; this lets the device
> * wake up the upstream hub (including maybe the root hub).
> *
> @@ -2366,8 +2364,9 @@ int usb_port_suspend(struct usb_device *
> status = 0;
> } else {
> /* device has up to 10 msec to fully suspend */
> - dev_dbg(&udev->dev, "usb %ssuspend\n",
> - (PMSG_IS_AUTO(msg) ? "auto-" : ""));
> + dev_dbg(&udev->dev, "usb %ssuspend, wakeup %d\n",
> + (PMSG_IS_AUTO(msg) ? "auto-" : ""),
> + udev->do_remote_wakeup);
> usb_set_device_state(udev, USB_STATE_SUSPENDED);
> msleep(10);
> }
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
