2019-08-22 10:01:46

by Markus Elfring

Subject: [PATCH] s390/ctcm: Delete unnecessary checks before the macro call “dev_kfree_skb”

From: Markus Elfring <[email protected]>
Date: Thu, 22 Aug 2019 10:55:33 +0200

The dev_kfree_skb() function performs also input parameter validation.
Thus the test around the shown calls is not needed.

This issue was detected by using the Coccinelle software.

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

diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index f63c5c871d3d..90025d1923d2 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1074,10 +1074,8 @@ static void ctcm_free_netdevice(struct net_device *dev)
if (grp) {
if (grp->fsm)
kfree_fsm(grp->fsm);
- if (grp->xid_skb)
- dev_kfree_skb(grp->xid_skb);
- if (grp->rcvd_xid_skb)
- dev_kfree_skb(grp->rcvd_xid_skb);
+ dev_kfree_skb(grp->xid_skb);
+ dev_kfree_skb(grp->rcvd_xid_skb);
tasklet_kill(&grp->mpc_tasklet2);
kfree(grp);
priv->mpcg = NULL;
--
2.23.0

2019-08-25 13:37:31

by Julian Wiedmann

Subject: Re: [PATCH] s390/ctcm: Delete unnecessary checks before the macro call “dev_kfree_skb”

On 22.08.19 17:04, Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Thu, 22 Aug 2019 10:55:33 +0200
>
> The dev_kfree_skb() function performs also input parameter validation.
> Thus the test around the shown calls is not needed.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <[email protected]>
> ---

Applied, thanks.

> drivers/s390/net/ctcm_main.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
> index f63c5c871d3d..90025d1923d2 100644
> --- a/drivers/s390/net/ctcm_main.c
> +++ b/drivers/s390/net/ctcm_main.c
> @@ -1074,10 +1074,8 @@ static void ctcm_free_netdevice(struct net_device *dev)
> if (grp) {
> if (grp->fsm)
> kfree_fsm(grp->fsm);
> - if (grp->xid_skb)
> - dev_kfree_skb(grp->xid_skb);
> - if (grp->rcvd_xid_skb)
> - dev_kfree_skb(grp->rcvd_xid_skb);
> + dev_kfree_skb(grp->xid_skb);
> + dev_kfree_skb(grp->rcvd_xid_skb);
> tasklet_kill(&grp->mpc_tasklet2);
> kfree(grp);
> priv->mpcg = NULL;
> --
> 2.23.0
>