From: SF Markus Elfring <elfring@users.sourceforge.net>
To: Bart Van Assche <bvanassche@acm.org>,
Hal Rosenstock <hal.rosenstock@gmail.com>,
Roland Dreier <roland@kernel.org>,
Sean Hefty <sean.hefty@intel.com>,
linux-rdma@vger.kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org,
Julia Lawall <julia.lawall@lip6.fr>
Subject: [PATCH] InfiniBand: Delete unnecessary checks before the function, call "srp_destroy_fr_pool"
Date: Thu, 05 Feb 2015 13:26:56 +0100 [thread overview]
Message-ID: <54D36190.1050407@users.sourceforge.net> (raw)
In-Reply-To: <5317A59D.4@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 5 Feb 2015 13:20:42 +0100
The srp_destroy_fr_pool() 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 <elfring@users.sourceforge.net>
---
drivers/infiniband/ulp/srp/ib_srp.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 0747c05..6f5dfa1 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -549,8 +549,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch)
"FR pool allocation failed (%d)\n", ret);
goto err_qp;
}
- if (ch->fr_pool)
- srp_destroy_fr_pool(ch->fr_pool);
+ srp_destroy_fr_pool(ch->fr_pool);
ch->fr_pool = fr_pool;
} else if (!dev->use_fast_reg && dev->has_fmr) {
fmr_pool = srp_alloc_fmr_pool(target);
@@ -615,13 +614,12 @@ static void srp_free_ch_ib(struct srp_target_port *target,
if (!ch->qp)
return;
- if (dev->use_fast_reg) {
- if (ch->fr_pool)
- srp_destroy_fr_pool(ch->fr_pool);
- } else {
+ if (dev->use_fast_reg)
+ srp_destroy_fr_pool(ch->fr_pool);
+ else
if (ch->fmr_pool)
ib_destroy_fmr_pool(ch->fmr_pool);
- }
+
srp_destroy_qp(ch);
ib_destroy_cq(ch->send_cq);
ib_destroy_cq(ch->recv_cq);
--
2.2.2
next prev parent reply other threads:[~2015-02-05 12:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <5307CAA2.8060406@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402212321410.2043@localhost6.localdomain6>
[not found] ` <530A086E.8010901@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402231635510.1985@localhost6.localdomain6>
[not found] ` <530A72AA.3000601@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402240658210.2090@localhost6.localdomain6>
[not found] ` <530B5FB6.6010207@users.sourceforge.net>
[not found] ` <alpine.DEB.2.10.1402241710370.2074@hadrien>
[not found] ` <530C5E18.1020800@users.sourceforge.net>
[not found] ` <alpine.DEB.2.10.1402251014170.2080@hadrien>
[not found] ` <530CD2C4.4050903@users.sourceforge.net>
[not found] ` <alpine.DEB.2.10.1402251840450.7035@hadrien>
[not found] ` <530CF8FF.8080600@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402252117150.2047@localhost6.localdomain6>
[not found] ` <530DD06F.4090703@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402262129250.2221@localhost6.localdomain6>
[not found] ` <5317A59D.4@users.so urceforge.net>
[not found] ` <5317A59D.4-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2014-11-19 18:25 ` [PATCH 1/1] InfiniBand: Deletion of unnecessary checks before two function calls SF Markus Elfring
[not found] ` <546CE09B.9090101-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2015-07-01 8:50 ` [PATCH] " SF Markus Elfring
2016-07-23 10:55 ` [PATCH 0/3] IB/mthca: Fine-tuning for mthca_reset() SF Markus Elfring
2016-07-23 10:58 ` [PATCH 1/3] IB/mthca: Delete an unnecessary check before the function call "pci_dev_put" SF Markus Elfring
2016-07-25 13:19 ` Leon Romanovsky
2016-07-23 10:59 ` [PATCH 2/3] IB/mthca: Less function calls in mthca_reset() after error detection SF Markus Elfring
[not found] ` <060a2178-afb2-28a3-9568-25c124972062-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2016-07-25 13:20 ` Leon Romanovsky
2016-07-23 11:00 ` [PATCH 3/3] IB/mthca: Delete unnecessary variable initialisations in mthca_reset() SF Markus Elfring
2016-08-02 19:40 ` [PATCH 0/3] IB/mthca: Fine-tuning for mthca_reset() Doug Ledford
2015-02-04 14:22 ` [PATCH] net: Mellanox: Delete unnecessary checks before the function call "vunmap" SF Markus Elfring
2015-02-04 14:59 ` Eli Cohen
[not found] ` <54D22B29.3020200-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2015-02-05 8:34 ` David Miller
[not found] ` <20150205.003404.261962007607296519.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2015-02-09 10:21 ` [PATCH v2] " SF Markus Elfring
2015-02-09 22:10 ` David Miller
2016-07-23 7:42 ` [PATCH] IB/hfi1: Delete an unnecessary check before the function call "sc_return_credits" SF Markus Elfring
[not found] ` <cd93853f-c315-eceb-347d-3bbb5ac9fb82-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2016-08-02 19:38 ` Doug Ledford
[not found] ` <5317A59D.4@users.sourceforge.net>
2015-02-05 12:26 ` SF Markus Elfring [this message]
2015-02-05 14:32 ` [PATCH] InfiniBand: Delete unnecessary checks before the function, call "srp_destroy_fr_pool" Bart Van Assche
2015-11-05 8:10 ` [PATCH] staging/rdma/hfi1: Delete unnecessary checks before two function calls SF Markus Elfring
2015-11-05 8:18 ` Dan Carpenter
2015-11-15 21:08 ` [PATCH] staging-EHCA: Delete unnecessary checks before the function call "kmem_cache_destroy" SF Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54D36190.1050407@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=bvanassche@acm.org \
--cc=hal.rosenstock@gmail.com \
--cc=julia.lawall@lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=roland@kernel.org \
--cc=sean.hefty@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).