lkml.org 
[lkml]   [2014]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/1] net: Xilinx: Deletion of unnecessary checks before two function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Thu, 20 Nov 2014 14:47:12 +0100

    The functions kfree() and of_node_put() 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>
    ---
    drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +--
    drivers/net/ethernet/xilinx/xilinx_emaclite.c | 3 +--
    2 files changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
    index fda5891..af60867 100644
    --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
    +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
    @@ -224,8 +224,7 @@ static void temac_dma_bd_release(struct net_device *ndev)
    dma_free_coherent(ndev->dev.parent,
    sizeof(*lp->tx_bd_v) * TX_BD_NUM,
    lp->tx_bd_v, lp->tx_bd_p);
    - if (lp->rx_skb)
    - kfree(lp->rx_skb);
    + kfree(lp->rx_skb);
    }

    /**
    diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
    index 28dbbdc..2485879 100644
    --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
    +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
    @@ -1200,8 +1200,7 @@ static int xemaclite_of_remove(struct platform_device *of_dev)

    unregister_netdev(ndev);

    - if (lp->phy_node)
    - of_node_put(lp->phy_node);
    + of_node_put(lp->phy_node);
    lp->phy_node = NULL;

    xemaclite_remove_ndev(ndev);
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-11-20 15:21    [W:4.109 / U:0.464 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site