From patchwork Mon Nov 16 11:52:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 544979 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EA07A141460 for ; Mon, 16 Nov 2015 22:52:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752181AbbKPLwi (ORCPT ); Mon, 16 Nov 2015 06:52:38 -0500 Received: from mout.web.de ([212.227.17.12]:54325 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751421AbbKPLwg (ORCPT ); Mon, 16 Nov 2015 06:52:36 -0500 Received: from [192.168.1.3] ([77.181.163.50]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MhliZ-1ZlJcL1RnH-00Mx3y; Mon, 16 Nov 2015 12:52:30 +0100 Subject: [PATCH] cxgb3: Delete unnecessary checks before the function call "kfree_skb" To: netdev@vger.kernel.org, Santosh Raspatur References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <5649C37C.9000603@users.sourceforge.net> Date: Mon, 16 Nov 2015 12:52:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <5317A59D.4@users.sourceforge.net> X-Provags-ID: V03:K0:i/ATLKOx1Su+xEikfagpFJylSYXotO4smuf2mHR7PHpdQ9esUj6 J6CUQpv0gYADgDu/GdHIt6uh6Avj5PaHcr0uLnRb49ottiKpfohwGwpyT43nN24m9CVDY7+ 6aL2N1mBD7+/KJ+znVlV4nMwqFfzTpURFxRRBVzdi0tFVzYMN/L5GCU34UG2O/83lYUuwTm aurZ6mUtzd3d1a+fNFkPQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:FBbVw1zwYrg=:MkitLDVMa0WRPgIbwPKXN9 HKsyVT5q89JWdgQDsNFHKHiFn0UZ3+PMb7iuTUXa0rpJ2jQlqwraEqp+gXtx4kftf7ts9TyDZ peXyaNyiNubjuA8OTHUTEccA0Fwpg/5YsoQ39b8cUM/qE7YZQEcOYBa7J8DLhW4uchkoD3sNI oV8W/r0zEqvAaD7C3z6G1Qbgn8zb2qilZjCj+oPPOr+kMo+IpO80o+pMXy60cYtUM+7HVJAw9 2M/tK3oXa+e1/Tvx/+O1oxoQUgjAiS2tMgfCeRXASYOTv+pQca5gP6+CmOkjdoh4bFd6mh1j/ ZToAmg8WV9SuTdaybxho+5uA1ydFQ8+N+FMGVfn1bheQyExI1tBz3UpCY7eqlM/Mk6mHjR7Ue ICtAJtJvz/XBoyH3ysljdqXgOuTpKHLAcSHZH52sPV44EgFbJ8opaeurkN7p2riE8ECTlavRF FHI+z3yZ2gGGc3J0qHJXKAQK2+82onW9mowxdTfyZhblu3Zl0Wcy88ePuUK21CpxpzqBJ4wOo 46sDm8K2HWu7Z/Xz71yrGWA04yvO/tgA00z5J2oP8hP2bRyL2mDhLjYWTCq5POxvGZCozHXVX g0WM+jmBnHRN4g3NRs+bCppxDzMgdUbY4mG8+eCVVmc9rWHB1W4dmH8pw/DEfgZwukCQorbKE JT0NeRHCIJEIOaOz6nPaKWIKWzFUPDvYAB3lXngftprOd/FXJYu5yDKi8HuuNWC7GbCXk9ZOP nitYq0zmosPjOwWyiZL9g/0dHrn7axxYW1tdwqqegU74hFIFr4XjK5NOXrLFEmY7bDCSjn2u4 T6HcwPK Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Markus Elfring Date: Mon, 16 Nov 2015 12:46:41 +0100 The kfree_skb() function tests whether its argument is NULL and then returns immediately. Thus the test around the calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 3 +-- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 8f7aa53a..89f193b 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -3401,8 +3401,7 @@ static void remove_one(struct pci_dev *pdev) free_netdev(adapter->port[i]); iounmap(adapter->regs); - if (adapter->nofail_skb) - kfree_skb(adapter->nofail_skb); + kfree_skb(adapter->nofail_skb); kfree(adapter); pci_release_regions(pdev); pci_disable_device(pdev); diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c index 76684dc..9a77339 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c @@ -1323,8 +1323,7 @@ void cxgb3_offload_deactivate(struct adapter *adapter) rcu_read_unlock(); RCU_INIT_POINTER(tdev->l2opt, NULL); call_rcu(&d->rcu_head, clean_l2_data); - if (t->nofail_skb) - kfree_skb(t->nofail_skb); + kfree_skb(t->nofail_skb); kfree(t); }