2015-02-04 15:00:50

by SF Markus Elfring

Subject: [PATCH] net: ep93xx_eth: Delete unnecessary checks before the function call "kfree"

From: Markus Elfring <[email protected]>
Date: Wed, 4 Feb 2015 15:56:58 +0100

The kfree() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <[email protected]>
---
drivers/net/ethernet/cirrus/ep93xx_eth.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index 3a12c09..de9f7c9 100644
--- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
+++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
@@ -475,8 +475,7 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep)
if (d)
dma_unmap_single(dev, d, PKT_BUF_SIZE, DMA_FROM_DEVICE);

- if (ep->rx_buf[i] != NULL)
- kfree(ep->rx_buf[i]);
+ kfree(ep->rx_buf[i]);
}

for (i = 0; i < TX_QUEUE_ENTRIES; i++) {
@@ -486,8 +485,7 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep)
if (d)
dma_unmap_single(dev, d, PKT_BUF_SIZE, DMA_TO_DEVICE);

- if (ep->tx_buf[i] != NULL)
- kfree(ep->tx_buf[i]);
+ kfree(ep->tx_buf[i]);
}

dma_free_coherent(dev, sizeof(struct ep93xx_descs), ep->descs,
--
2.2.2

2015-02-04 15:59:38

by Hartley Sweeten

Subject: RE: [PATCH] net: ep93xx_eth: Delete unnecessary checks before the function call "kfree"

On Wednesday, February 04, 2015 8:01 AM, Markus Elfring wrote:
> The kfree() function tests whether its argument is NULL and then
> returns immediately. Thus the test around the call is not needed.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <[email protected]>
> ---
> drivers/net/ethernet/cirrus/ep93xx_eth.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
> index 3a12c09..de9f7c9 100644
> --- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
> +++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
> @@ -475,8 +475,7 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep)
> if (d)
> dma_unmap_single(dev, d, PKT_BUF_SIZE, DMA_FROM_DEVICE);
>
> - if (ep->rx_buf[i] != NULL)
> - kfree(ep->rx_buf[i]);
> + kfree(ep->rx_buf[i]);
> }
>
> for (i = 0; i < TX_QUEUE_ENTRIES; i++) {
> @@ -486,8 +485,7 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep)
> if (d)
> dma_unmap_single(dev, d, PKT_BUF_SIZE, DMA_TO_DEVICE);
>
> - if (ep->tx_buf[i] != NULL)
> - kfree(ep->tx_buf[i]);
> + kfree(ep->tx_buf[i]);
> }
>
> dma_free_coherent(dev, sizeof(struct ep93xx_descs), ep->descs,

Signed-off-by: H Hartley Sweeten <[email protected]>

Thanks

2015-02-05 08:37:33

by David Miller

Subject: Re: [PATCH] net: ep93xx_eth: Delete unnecessary checks before the function call "kfree"

From: SF Markus Elfring <[email protected]>
Date: Wed, 04 Feb 2015 16:00:37 +0100

> From: Markus Elfring <[email protected]>
> Date: Wed, 4 Feb 2015 15:56:58 +0100
>
> The kfree() function tests whether its argument is NULL and then
> returns immediately. Thus the test around the call is not needed.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <[email protected]>

Applied.