lkml.org 
[lkml]   [2007]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -mm 3/3] PM: Do not check parent state in suspend and resume core code
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    The checks if the device's parent is in the right state done in
    drivers/base/power/suspend.c and drivers/base/power/resume.c serve no particular
    purpose, since if the parent is in a wrong power state, the device's suspend or
    resume callbacks are supposed to return an error anyway. Moreover, they are
    also useless from the sanity checking point of view, because they rely on the
    code being checked to set dev->parent->power.power_state.event appropriately,
    which need not happen if that code is buggy. For these reasons they can be
    removed.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    ---
    drivers/base/power/resume.c | 7 -------
    drivers/base/power/suspend.c | 7 -------
    2 files changed, 14 deletions(-)

    Index: linux-2.6.22-rc4/drivers/base/power/resume.c
    ===================================================================
    --- linux-2.6.22-rc4.orig/drivers/base/power/resume.c 2007-06-16 01:08:13.000000000 +0200
    +++ linux-2.6.22-rc4/drivers/base/power/resume.c 2007-06-16 01:12:53.000000000 +0200
    @@ -29,13 +29,6 @@ int resume_device(struct device * dev)

    down(&dev->sem);

    - if (dev->parent && dev->parent->power.power_state.event) {
    - dev_err(dev, "PM: resume from %d, parent %s still %d\n",
    - dev->power.power_state.event,
    - dev->parent->bus_id,
    - dev->parent->power.power_state.event);
    - }
    -
    if (dev->bus && dev->bus->resume) {
    dev_dbg(dev,"resuming\n");
    error = dev->bus->resume(dev);
    Index: linux-2.6.22-rc4/drivers/base/power/suspend.c
    ===================================================================
    --- linux-2.6.22-rc4.orig/drivers/base/power/suspend.c 2007-06-16 01:12:04.000000000 +0200
    +++ linux-2.6.22-rc4/drivers/base/power/suspend.c 2007-06-16 01:12:53.000000000 +0200
    @@ -63,13 +63,6 @@ int suspend_device(struct device * dev,
    dev_dbg(dev, "PM: suspend %d-->%d\n",
    dev->power.power_state.event, state.event);
    }
    - if (dev->parent && dev->parent->power.power_state.event) {
    - dev_err(dev,
    - "PM: suspend %d->%d, parent %s already %d\n",
    - dev->power.power_state.event, state.event,
    - dev->parent->bus_id,
    - dev->parent->power.power_state.event);
    - }

    if (dev->class && dev->class->suspend) {
    suspend_device_dbg(dev, state, "class ");
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-06-17 20:13    [W:0.022 / U:95.124 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site