lkml.org 
[lkml]   [2007]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -mm 3/7] PM: Simplify suspend_device
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Reduce code duplication in drivers/base/suspend.c by introducing a separate
    function for printing diagnostic messages.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    ---
    drivers/base/power/suspend.c | 49 +++++++++++++++----------------------------
    1 file changed, 18 insertions(+), 31 deletions(-)

    Index: linux-2.6.22-rc4-mm2/drivers/base/power/suspend.c
    ===================================================================
    --- linux-2.6.22-rc4-mm2.orig/drivers/base/power/suspend.c
    +++ linux-2.6.22-rc4-mm2/drivers/base/power/suspend.c
    @@ -40,6 +40,14 @@ static inline char *suspend_verb(u32 eve
    }


    +static void
    +suspend_device_dbg(struct device * dev, pm_message_t state, char *info)
    +{
    + dev_dbg(dev, "%s%s%s\n", info, suspend_verb(state.event),
    + ((state.event == PM_EVENT_SUSPEND) && device_may_wakeup(dev)) ?
    + ", may wakeup" : "");
    +}
    +
    /**
    * suspend_device - Save state of one device.
    * @dev: Device.
    @@ -66,37 +74,21 @@ int suspend_device(struct device * dev,
    dev->power.prev_state = dev->power.power_state;

    if (dev->class && dev->class->suspend && !dev->power.power_state.event) {
    - dev_dbg(dev, "class %s%s\n",
    - suspend_verb(state.event),
    - ((state.event == PM_EVENT_SUSPEND)
    - && device_may_wakeup(dev))
    - ? ", may wakeup"
    - : ""
    - );
    + suspend_device_dbg(dev, state, "class ");
    error = dev->class->suspend(dev, state);
    suspend_report_result(dev->class->suspend, error);
    }

    - if (!error && dev->type && dev->type->suspend && !dev->power.power_state.event) {
    - dev_dbg(dev, "%s%s\n",
    - suspend_verb(state.event),
    - ((state.event == PM_EVENT_SUSPEND)
    - && device_may_wakeup(dev))
    - ? ", may wakeup"
    - : ""
    - );
    + if (!error && dev->type && dev->type->suspend
    + && !dev->power.power_state.event) {
    + suspend_device_dbg(dev, state, "type ");
    error = dev->type->suspend(dev, state);
    suspend_report_result(dev->type->suspend, error);
    }

    - if (!error && dev->bus && dev->bus->suspend && !dev->power.power_state.event) {
    - dev_dbg(dev, "%s%s\n",
    - suspend_verb(state.event),
    - ((state.event == PM_EVENT_SUSPEND)
    - && device_may_wakeup(dev))
    - ? ", may wakeup"
    - : ""
    - );
    + if (!error && dev->bus && dev->bus->suspend
    + && !dev->power.power_state.event) {
    + suspend_device_dbg(dev, state, "");
    error = dev->bus->suspend(dev, state);
    suspend_report_result(dev->bus->suspend, error);
    }
    @@ -114,14 +106,9 @@ static int suspend_device_late(struct de
    {
    int error = 0;

    - if (dev->bus && dev->bus->suspend_late && !dev->power.power_state.event) {
    - dev_dbg(dev, "LATE %s%s\n",
    - suspend_verb(state.event),
    - ((state.event == PM_EVENT_SUSPEND)
    - && device_may_wakeup(dev))
    - ? ", may wakeup"
    - : ""
    - );
    + if (dev->bus && dev->bus->suspend_late
    + && !dev->power.power_state.event) {
    + suspend_device_dbg(dev, state, "LATE ");
    error = dev->bus->suspend_late(dev, state);
    suspend_report_result(dev->bus->suspend_late, error);
    }
    -
    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-13 23:35    [W:0.024 / U:32.592 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site