lkml.org 
[lkml]   [2015]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] ARM: OMAP2: Delete unnecessary checks before three function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Tue, 30 Jun 2015 14:00:16 +0200

    The functions clk_disable(), of_node_put() and omap_device_delete() test
    whether their argument is NULL and then return immediately.
    Thus the test around the call is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    arch/arm/mach-omap2/omap_device.c | 3 +--
    arch/arm/mach-omap2/omap_hwmod.c | 5 +----
    arch/arm/mach-omap2/timer.c | 3 +--
    3 files changed, 3 insertions(+), 8 deletions(-)

    diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
    index 4cb8fd9..196366e 100644
    --- a/arch/arm/mach-omap2/omap_device.c
    +++ b/arch/arm/mach-omap2/omap_device.c
    @@ -193,8 +193,7 @@ static int _omap_device_notifier_call(struct notifier_block *nb,

    switch (event) {
    case BUS_NOTIFY_DEL_DEVICE:
    - if (pdev->archdata.od)
    - omap_device_delete(pdev->archdata.od);
    + omap_device_delete(pdev->archdata.od);
    break;
    case BUS_NOTIFY_ADD_DEVICE:
    if (pdev->dev.of_node)
    diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
    index d78c12e..1091ee7 100644
    --- a/arch/arm/mach-omap2/omap_hwmod.c
    +++ b/arch/arm/mach-omap2/omap_hwmod.c
    @@ -921,10 +921,7 @@ static int _disable_clocks(struct omap_hwmod *oh)
    int i = 0;

    pr_debug("omap_hwmod: %s: disabling clocks\n", oh->name);
    -
    - if (oh->_clk)
    - clk_disable(oh->_clk);
    -
    + clk_disable(oh->_clk);
    p = oh->slave_ports.next;

    while (i < oh->slaves_cnt) {
    diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
    index cac46d8..15448221 100644
    --- a/arch/arm/mach-omap2/timer.c
    +++ b/arch/arm/mach-omap2/timer.c
    @@ -208,8 +208,7 @@ static void __init omap_dmtimer_init(void)
    /* If we are a secure device, remove any secure timer nodes */
    if ((omap_type() != OMAP2_DEVICE_TYPE_GP)) {
    np = omap_get_timer_dt(omap_timer_match, "ti,timer-secure");
    - if (np)
    - of_node_put(np);
    + of_node_put(np);
    }
    }

    --
    2.4.5


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