lkml.org 
[lkml]   [2008]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subjectpatch power_state-remove-it-from-usb.patch added to gregkh-2.6 tree
    From
    Date

    This is a note to let you know that I've just added the patch titled

    Subject: power_state: remove it from usb

    to my gregkh-2.6 tree. Its filename is

    power_state-remove-it-from-usb.patch

    This tree can be found at
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/


    From pavel@ucw.cz Thu Feb 21 13:36:03 2008
    From: Pavel Machek <pavel@ucw.cz>
    Date: Thu, 21 Feb 2008 14:01:45 +0100
    Subject: power_state: remove it from usb
    To: kernel list <linux-kernel@vger.kernel.org>, Linux-pm mailing list <linux-pm@lists.osdl.org>, Greg KH <greg@kroah.com>, stern@rowland.harvard.edu, linux-usb@vger.kernel.org
    Message-ID: <20080221130145.GA3789@elf.ucw.cz>
    Content-Disposition: inline



    power_state is scheduled for removal, and it is used only write-only
    by USB. Remove it.

    Signed-off-by: Pavel Machek <pavel@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/usb/core/driver.c | 3 ---
    drivers/usb/core/hcd-pci.c | 5 -----
    drivers/usb/core/usb.h | 2 --
    3 files changed, 10 deletions(-)

    --- a/drivers/usb/core/driver.c
    +++ b/drivers/usb/core/driver.c
    @@ -794,8 +794,6 @@ static int usb_suspend_device(struct usb

    done:
    dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);
    - if (status == 0)
    - udev->dev.power.power_state.event = msg.event;
    return status;
    }

    @@ -826,7 +824,6 @@ static int usb_resume_device(struct usb_
    dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);
    if (status == 0) {
    udev->autoresume_disabled = 0;
    - udev->dev.power.power_state.event = PM_EVENT_ON;
    }
    return status;
    }
    --- a/drivers/usb/core/hcd-pci.c
    +++ b/drivers/usb/core/hcd-pci.c
    @@ -73,7 +73,6 @@ int usb_hcd_pci_probe(struct pci_dev *de
    if (pci_enable_device(dev) < 0)
    return -ENODEV;
    dev->current_state = PCI_D0;
    - dev->dev.power.power_state = PMSG_ON;

    if (!dev->irq) {
    dev_err(&dev->dev,
    @@ -302,8 +301,6 @@ int usb_hcd_pci_suspend(struct pci_dev *

    done:
    if (retval == 0) {
    - dev->dev.power.power_state = PMSG_SUSPEND;
    -
    #ifdef CONFIG_PPC_PMAC
    /* Disable ASIC clocks for USB */
    if (machine_is(powermac)) {
    @@ -406,8 +403,6 @@ int usb_hcd_pci_resume(struct pci_dev *d
    pci_set_master(dev);
    pci_restore_state(dev);

    - dev->dev.power.power_state = PMSG_ON;
    -
    clear_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);

    if (hcd->driver->resume) {
    --- a/drivers/usb/core/usb.h
    +++ b/drivers/usb/core/usb.h
    @@ -114,13 +114,11 @@ static inline int is_usb_device_driver(s
    static inline void mark_active(struct usb_interface *f)
    {
    f->is_active = 1;
    - f->dev.power.power_state.event = PM_EVENT_ON;
    }

    static inline void mark_quiesced(struct usb_interface *f)
    {
    f->is_active = 0;
    - f->dev.power.power_state.event = PM_EVENT_SUSPEND;
    }

    static inline int is_active(const struct usb_interface *f)

    Patches currently in gregkh-2.6 which might be from pavel@ucw.cz are

    driver/driver-core-pm-make-suspend_device-static.patch
    driver/pm-remove-unbalanced-mutex_unlock-from-dpm_resume.patch
    driver/power_state-remove-it-from-driver-core.patch
    usb/power_state-remove-it-from-usb.patch


    \
     
     \ /
      Last update: 2008-02-21 22:47    [W:0.039 / U:30.288 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site