lkml.org 
[lkml]   [2015]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[REPOST PATCH 1/3] USB: Export usb_wakeup_enabled_descendants()
    Date
    In (e583d9d USB: global suspend and remote wakeup don't mix) we
    introduced wakeup_enabled_descendants() as a static function. We'd
    like to use this function in USB controller drivers to know if we
    should keep the controller on during suspend time, since doing so has
    a power impact.

    Signed-off-by: Douglas Anderson <dianders@chromium.org>
    ---
    drivers/usb/core/hub.c | 7 ++++---
    include/linux/usb/hcd.h | 5 +++++
    2 files changed, 9 insertions(+), 3 deletions(-)

    diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
    index 43cb2f2..fdc59db 100644
    --- a/drivers/usb/core/hub.c
    +++ b/drivers/usb/core/hub.c
    @@ -3034,13 +3034,14 @@ static int usb_disable_remote_wakeup(struct usb_device *udev)
    }

    /* Count of wakeup-enabled devices at or below udev */
    -static unsigned wakeup_enabled_descendants(struct usb_device *udev)
    +unsigned usb_wakeup_enabled_descendants(struct usb_device *udev)
    {
    struct usb_hub *hub = usb_hub_to_struct_hub(udev);

    return udev->do_remote_wakeup +
    (hub ? hub->wakeup_enabled_descendants : 0);
    }
    +EXPORT_SYMBOL_GPL(usb_wakeup_enabled_descendants);

    /*
    * usb_port_suspend - suspend a usb device's upstream port
    @@ -3149,7 +3150,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
    * Therefore we will turn on the suspend feature if udev or any of its
    * descendants is enabled for remote wakeup.
    */
    - else if (PMSG_IS_AUTO(msg) || wakeup_enabled_descendants(udev) > 0)
    + else if (PMSG_IS_AUTO(msg) || usb_wakeup_enabled_descendants(udev) > 0)
    status = set_port_feature(hub->hdev, port1,
    USB_PORT_FEAT_SUSPEND);
    else {
    @@ -3548,7 +3549,7 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
    }
    if (udev)
    hub->wakeup_enabled_descendants +=
    - wakeup_enabled_descendants(udev);
    + usb_wakeup_enabled_descendants(udev);
    }

    if (hdev->do_remote_wakeup && hub->quirk_check_port_auto_suspend) {
    diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
    index c9aa779..30d74c9 100644
    --- a/include/linux/usb/hcd.h
    +++ b/include/linux/usb/hcd.h
    @@ -626,11 +626,16 @@ extern wait_queue_head_t usb_kill_urb_queue;
    #define usb_endpoint_out(ep_dir) (!((ep_dir) & USB_DIR_IN))

    #ifdef CONFIG_PM
    +extern unsigned usb_wakeup_enabled_descendants(struct usb_device *udev);
    extern void usb_root_hub_lost_power(struct usb_device *rhdev);
    extern int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg);
    extern int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg);
    extern void usb_hcd_resume_root_hub(struct usb_hcd *hcd);
    #else
    +static inline unsigned usb_wakeup_enabled_descendants(struct usb_device *udev)
    +{
    + return 0;
    +}
    static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd)
    {
    return;
    --
    2.4.3.573.g4eafbef


    \
     
     \ /
      Last update: 2015-07-06 20:41    [W:2.902 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site