Skip to content

Commit

Permalink
net: Xilinx: Deletion of unnecessary checks before two function calls
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Markus Elfring authored and David S. Miller committed Nov 21, 2014
1 parent 5ac0fd0 commit 38a90e7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions drivers/net/ethernet/xilinx/ll_temac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/ethernet/xilinx/xilinx_emaclite.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 38a90e7

Please sign in to comment.