Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754646AbbKQTU0 (ORCPT ); Tue, 17 Nov 2015 14:20:26 -0500 Received: from mout.web.de ([212.227.15.3]:57307 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753286AbbKQTUX (ORCPT ); Tue, 17 Nov 2015 14:20:23 -0500 Subject: [PATCH] s390-ctcm: Delete unnecessary checks before the function call "channel_remove" To: linux-s390@vger.kernel.org, Ursula Braun , Martin Schwidefsky , Heiko Carstens 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 X-Enigmail-Draft-Status: N1110 Message-ID: <564B7DEF.6050005@users.sourceforge.net> Date: Tue, 17 Nov 2015 20:20:15 +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> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:JfAaicPiGbe7vqq0y0CCRc3IniPooNE7ktPfiEaYrk5APlcSHeA 2g4I3StuxzyA4NPJ5iwIPNs0ZIG0ucWufk0XV+H+W+SP8znrFlRyeOc5oeYEghE14WvqNTs hMdSr0jkByCDnLuATmtxKRUmhjLs12mvtf2YdBQxwzrCAQP7V5MO37VbZEe9oPSFy8KhShc CBbAYXT43Hutg03zlF0kQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:v1CwCiLzOp0=:GsNcbgMX2I0M6cyl5wTDeR OMTYbQnfplnvpS/38v9S+Xutwnenru7mFC2LXEH3B2nQrO5nETVpIzdeDOoRbU0pi73g4fXvT ZQhfJBX4xHj4MByRebunU27SOxHwoK80KhA2JsjwxeN4pfmYe1x1VZ347kpqTzj+AMgbOalah wZkUFojz6rPlofMXDrLz8h1yqyvoSsTXkznYFsDRZsuOAhWBqv3dX9rE2a0ESuqZVvOUt4M1X yT+QEq003CMLZEtwC8zmRJBYFIgxNyVMyLyV5+E/S0wc8PCGiVE8hk7B2Zz63bmyX38IPycCt a1AZNG+6p2yKXo2fAunKBXabaOPDVhbN/lcvTU6dcoUptO9towJrjgfA9DCJIyjsVpUD/Tuzd y7ejk8NcqldisXTTpB2HLR5VQAp2GqHffhpBqP3+Yz45dDghyTvHTPwlsZXSI7dAcV8UC1PA6 mKUyOKKH2JKoEJPccBf65uxCrYS38hrRH+uC2e2K351mIxxOvjOVnLwNvZ4mZlNLLSrtYvOAG u25/6jjyIhUkf7l/1z6/ZUEzZI8UucPtGCiwBwgO2Ct/tkBpfKcN6iWzzzZE5G5S54JU3lpE2 UA+ZZMZ0pf+VSnjwpHmHdx/3M7eUIqJ+AkZ6e1QPMHzxQsc+vidqRLS3+66/4znsi02UBF0aG 6PUQGU3SAnVMPNOFCfQ3/oq6vFx26vrE3BtJzYq8As7id75ZrSetavH4WMfQ+UgipgYVfq1vw CL9T3Hckp5oKyeETRhzZLJluk+A4WAY6+9AMnc7kVn/jzQNPrBwJLNa2KoY3VHVXSqW08qZKm N3qF7mO Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1376 Lines: 39 From: Markus Elfring 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/