| From 63f44e207321de3a77610c49bec6fc0bf1b9d3fa Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Sat, 28 Jun 2014 04:10:00 +0400 |
| Subject: sh_eth: remove checks around dev_kfree_skb() calls |
| |
| Since consume_skb() (and hence dev_kfree_skb() macro) checks the passed pointer |
| for NULL, there's no need to check for NULL before invoking dev_kfree_skb(). |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 179d80aff82bf8dff9db30589fe5a2297c454d35) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 18 ++++++------------ |
| 1 file changed, 6 insertions(+), 12 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 10af820e1d45..26936b91f63f 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -1094,20 +1094,16 @@ static void sh_eth_ring_free(struct net_device *ndev) |
| |
| /* Free Rx skb ringbuffer */ |
| if (mdp->rx_skbuff) { |
| - for (i = 0; i < mdp->num_rx_ring; i++) { |
| - if (mdp->rx_skbuff[i]) |
| - dev_kfree_skb(mdp->rx_skbuff[i]); |
| - } |
| + for (i = 0; i < mdp->num_rx_ring; i++) |
| + dev_kfree_skb(mdp->rx_skbuff[i]); |
| } |
| kfree(mdp->rx_skbuff); |
| mdp->rx_skbuff = NULL; |
| |
| /* Free Tx skb ringbuffer */ |
| if (mdp->tx_skbuff) { |
| - for (i = 0; i < mdp->num_tx_ring; i++) { |
| - if (mdp->tx_skbuff[i]) |
| - dev_kfree_skb(mdp->tx_skbuff[i]); |
| - } |
| + for (i = 0; i < mdp->num_tx_ring; i++) |
| + dev_kfree_skb(mdp->tx_skbuff[i]); |
| } |
| kfree(mdp->tx_skbuff); |
| mdp->tx_skbuff = NULL; |
| @@ -2077,13 +2073,11 @@ static void sh_eth_tx_timeout(struct net_device *ndev) |
| rxdesc = &mdp->rx_ring[i]; |
| rxdesc->status = 0; |
| rxdesc->addr = 0xBADF00D0; |
| - if (mdp->rx_skbuff[i]) |
| - dev_kfree_skb(mdp->rx_skbuff[i]); |
| + dev_kfree_skb(mdp->rx_skbuff[i]); |
| mdp->rx_skbuff[i] = NULL; |
| } |
| for (i = 0; i < mdp->num_tx_ring; i++) { |
| - if (mdp->tx_skbuff[i]) |
| - dev_kfree_skb(mdp->tx_skbuff[i]); |
| + dev_kfree_skb(mdp->tx_skbuff[i]); |
| mdp->tx_skbuff[i] = NULL; |
| } |
| |
| -- |
| 2.1.2 |
| |