From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-s390@vger.kernel.org,
Ursula Braun <ursula.braun@de.ibm.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
Julia Lawall <julia.lawall@lip6.fr>
Subject: [PATCH] s390-ctcm: Delete unnecessary checks before the function call "channel_remove"
Date: Tue, 17 Nov 2015 20:20:15 +0100 [thread overview]
Message-ID: <564B7DEF.6050005@users.sourceforge.net> (raw)
In-Reply-To: <5317A59D.4@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 17 Nov 2015 20:10:02 +0100
The channel_remove() 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 <elfring@users.sourceforge.net>
---
drivers/s390/net/ctcm_main.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 05c37d6..c3e2252 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1677,11 +1677,8 @@ static int ctcm_shutdown_device(struct ccwgroup_device *cgdev)
ccw_device_set_offline(cgdev->cdev[1]);
ccw_device_set_offline(cgdev->cdev[0]);
-
- if (priv->channel[CTCM_READ])
- channel_remove(priv->channel[CTCM_READ]);
- if (priv->channel[CTCM_WRITE])
- channel_remove(priv->channel[CTCM_WRITE]);
+ channel_remove(priv->channel[CTCM_READ]);
+ channel_remove(priv->channel[CTCM_WRITE]);
priv->channel[CTCM_READ] = priv->channel[CTCM_WRITE] = NULL;
return 0;
--
2.6.2
next prev parent reply other threads:[~2015-11-17 19:20 UTC|newest]
Thread overview: 28+ 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.sourceforge.net>
2014-10-31 17:40 ` [PATCH 1/1] s390/net: Deletion of unnecessary checks before two function calls SF Markus Elfring
2014-11-03 9:50 ` Dan Carpenter
2014-11-03 15:55 ` SF Markus Elfring
2014-11-03 16:25 ` Dan Carpenter
2014-11-03 16:50 ` SF Markus Elfring
2014-11-03 17:02 ` Julia Lawall
2014-11-03 17:16 ` Dan Carpenter
2014-11-03 17:40 ` SF Markus Elfring
2015-01-19 18:55 ` [PATCH 1/1] " Brian Norris
2014-11-03 11:04 ` Ursula Braun
2014-11-03 16:10 ` SF Markus Elfring
2014-11-03 16:28 ` Dan Carpenter
[not found] ` <54687F1A.1010809@users.sourceforge.net>
[not found] ` <20141116111023.GA4905@mwanda>
[not found] ` <20141116111446.GA4956@mwanda>
[not found] ` <54688F15.9070703@users.sourceforge.net>
[not found] ` <20141117073408.GC4905@mwanda>
[not found] ` <5469B836.8030507@users.sourceforge.net>
[not found] ` <20141117134515.GE4905@mwanda>
2014-11-17 14:30 ` SF Markus Elfring
2014-11-22 14:05 ` [PATCH 1/1] s390/pci: Deletion of unnecessary checks before the function call "debug_unregister" SF Markus Elfring
2014-11-24 19:06 ` Sebastian Ott
2015-06-24 20:48 ` [PATCH] s390/process: Delete an unnecessary check before the function call "kfree" SF Markus Elfring
2015-06-25 10:02 ` walter harms
2015-06-25 11:37 ` Heiko Carstens
2015-11-16 13:23 ` [PATCH] SCSI-zfcp: Delete unnecessary checks before the function call "mempool_destroy" SF Markus Elfring
2015-12-04 17:57 ` Benjamin Block
2016-01-14 14:56 ` Steffen Maier
2015-11-16 14:15 ` [PATCH] s390: Delete unnecessary checks before the function call "debug_unregister" SF Markus Elfring
2015-11-16 15:30 ` Heiko Carstens
2015-11-17 19:20 ` SF Markus Elfring [this message]
2015-11-25 9:37 ` [PATCH] s390-ctcm: Delete unnecessary checks before the function call "channel_remove" Ursula Braun
2016-07-16 18:40 ` [PATCH] s390/pci: Delete an unnecessary check before the function call "pci_dev_put" SF Markus Elfring
2016-07-18 7:00 ` Martin Schwidefsky
[not found] <56558930.6000209@bfs.de>
2015-11-26 10:58 ` [PATCH] s390-ctcm: Delete unnecessary checks before the function call "channel_remove" Ursula Braun
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=564B7DEF.6050005@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=heiko.carstens@de.ibm.com \
--cc=julia.lawall@lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=ursula.braun@de.ibm.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).