| Message ID | 27674907-fd2a-7f0c-84fd-d8b5124739a9@web.de |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | can: Delete unnecessary checks before the macro call “dev_kfree_skb” | expand |
On 21/08/2019 21.30, Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Wed, 21 Aug 2019 21:16:15 +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 <elfring@users.sourceforge.net> Acked-by: Sean Nyekjaer <sean@geanix.com> > --- > drivers/net/can/spi/hi311x.c | 3 +-- > drivers/net/can/spi/mcp251x.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c > index 03a711c3221b..7c7c7e78214c 100644 > --- a/drivers/net/can/spi/hi311x.c > +++ b/drivers/net/can/spi/hi311x.c > @@ -184,8 +184,7 @@ static void hi3110_clean(struct net_device *net) > > if (priv->tx_skb || priv->tx_len) > net->stats.tx_errors++; > - if (priv->tx_skb) > - dev_kfree_skb(priv->tx_skb); > + dev_kfree_skb(priv->tx_skb); > if (priv->tx_len) > can_free_echo_skb(priv->net, 0); > priv->tx_skb = NULL; > diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c > index 12358f06d194..1c496d2adb45 100644 > --- a/drivers/net/can/spi/mcp251x.c > +++ b/drivers/net/can/spi/mcp251x.c > @@ -274,8 +274,7 @@ static void mcp251x_clean(struct net_device *net) > > if (priv->tx_skb || priv->tx_len) > net->stats.tx_errors++; > - if (priv->tx_skb) > - dev_kfree_skb(priv->tx_skb); > + dev_kfree_skb(priv->tx_skb); > if (priv->tx_len) > can_free_echo_skb(priv->net, 0); > priv->tx_skb = NULL; > -- > 2.23.0 > Good catch Markus :-) /Sean
From: Markus Elfring <Markus.Elfring@web.de> Date: Wed, 21 Aug 2019 21:30:11 +0200 > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Wed, 21 Aug 2019 21:16:15 +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 <elfring@users.sourceforge.net> Applied.
diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c index 03a711c3221b..7c7c7e78214c 100644 --- a/drivers/net/can/spi/hi311x.c +++ b/drivers/net/can/spi/hi311x.c @@ -184,8 +184,7 @@ static void hi3110_clean(struct net_device *net) if (priv->tx_skb || priv->tx_len) net->stats.tx_errors++; - if (priv->tx_skb) - dev_kfree_skb(priv->tx_skb); + dev_kfree_skb(priv->tx_skb); if (priv->tx_len) can_free_echo_skb(priv->net, 0); priv->tx_skb = NULL; diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c index 12358f06d194..1c496d2adb45 100644 --- a/drivers/net/can/spi/mcp251x.c +++ b/drivers/net/can/spi/mcp251x.c @@ -274,8 +274,7 @@ static void mcp251x_clean(struct net_device *net) if (priv->tx_skb || priv->tx_len) net->stats.tx_errors++; - if (priv->tx_skb) - dev_kfree_skb(priv->tx_skb); + dev_kfree_skb(priv->tx_skb); if (priv->tx_len) can_free_echo_skb(priv->net, 0); priv->tx_skb = NULL;