lkml.org 
[lkml]   [2016]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] PM-wakeup: Delete unnecessary checks before three function calls
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sat, 23 Jul 2016 17:04:00 +0200

    The following functions test whether their argument is NULL
    and then return immediately.
    * dev_pm_arm_wake_irq
    * dev_pm_disarm_wake_irq
    * wakeup_source_unregister

    Thus the test around the calls is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/base/power/wakeup.c | 16 +++++-----------
    1 file changed, 5 insertions(+), 11 deletions(-)

    diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
    index 5fb7718..c35d3f5 100644
    --- a/drivers/base/power/wakeup.c
    +++ b/drivers/base/power/wakeup.c
    @@ -334,10 +334,8 @@ void device_wakeup_arm_wake_irqs(void)
    struct wakeup_source *ws;

    rcu_read_lock();
    - list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
    - if (ws->wakeirq)
    - dev_pm_arm_wake_irq(ws->wakeirq);
    - }
    + list_for_each_entry_rcu(ws, &wakeup_sources, entry)
    + dev_pm_arm_wake_irq(ws->wakeirq);
    rcu_read_unlock();
    }

    @@ -351,10 +349,8 @@ void device_wakeup_disarm_wake_irqs(void)
    struct wakeup_source *ws;

    rcu_read_lock();
    - list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
    - if (ws->wakeirq)
    - dev_pm_disarm_wake_irq(ws->wakeirq);
    - }
    + list_for_each_entry_rcu(ws, &wakeup_sources, entry)
    + dev_pm_disarm_wake_irq(ws->wakeirq);
    rcu_read_unlock();
    }

    @@ -390,9 +386,7 @@ int device_wakeup_disable(struct device *dev)
    return -EINVAL;

    ws = device_wakeup_detach(dev);
    - if (ws)
    - wakeup_source_unregister(ws);
    -
    + wakeup_source_unregister(ws);
    return 0;
    }
    EXPORT_SYMBOL_GPL(device_wakeup_disable);
    --
    2.9.2
    \
     
     \ /
      Last update: 2016-07-23 17:41    [W:4.026 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site