netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ursula Braun <ubraun@linux.vnet.ibm.com>
To: davem@davemloft.net, mschwid2@linux.vnet.ibm.com,
	heicars2@linux.vnet.ibm.com, netdev@vger.kernel.org,
	linux-s390@vger.kernel.org
Cc: ubraunu@linux.vnet.ibm.com
Subject: [PATCH net-next 4/8] s390-ctcm: Delete unnecessary checks before the function call "channel_remove"
Date: Fri, 11 Dec 2015 12:27:53 +0100	[thread overview]
Message-ID: <1449833277-69012-5-git-send-email-ubraun@linux.vnet.ibm.com> (raw)
In-Reply-To: <1449833277-69012-1-git-send-email-ubraun@linux.vnet.ibm.com>

From: Markus Elfring <elfring@users.sourceforge.net>

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>
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
---
 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.3.9

  parent reply	other threads:[~2015-12-11 11:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-11 11:27 [PATCH net-next 0/8] s390 network patches Ursula Braun
2015-12-11 11:27 ` [PATCH net-next 1/8] iucv: prevent information leak in iucv_message Ursula Braun
2015-12-11 11:27 ` [PATCH net-next 2/8] iucv: call skb_linearize() when needed Ursula Braun
2015-12-11 11:27 ` [PATCH net-next 3/8] MAINTAINERS: switch to alternate IBM mail address Ursula Braun
2015-12-11 11:27 ` Ursula Braun [this message]
2015-12-11 11:27 ` [PATCH net-next 5/8] qeth use common function qeth_get_setassparms_cmd Ursula Braun
2015-12-11 11:27 ` [PATCH net-next 6/8] qeth: initialize net_device with carrier off Ursula Braun
2015-12-11 11:27 ` [PATCH net-next 7/8] qeth: repair SBAL elements calculation Ursula Braun
2015-12-11 11:27 ` [PATCH net-next 8/8] qeth: get rid of redundant 0-termination Ursula Braun
2015-12-14 21:17 ` [PATCH net-next 0/8] s390 network patches David Miller

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=1449833277-69012-5-git-send-email-ubraun@linux.vnet.ibm.com \
    --to=ubraun@linux.vnet.ibm.com \
    --cc=davem@davemloft.net \
    --cc=heicars2@linux.vnet.ibm.com \
    --cc=linux-s390@vger.kernel.org \
    --cc=mschwid2@linux.vnet.ibm.com \
    --cc=netdev@vger.kernel.org \
    --cc=ubraunu@linux.vnet.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).