From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755515AbbKCRbv (ORCPT ); Tue, 3 Nov 2015 12:31:51 -0500 Received: from mout.web.de ([212.227.17.11]:53233 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932186AbbKCRbs (ORCPT ); Tue, 3 Nov 2015 12:31:48 -0500 Subject: [PATCH] irda: Delete an unnecessary check before the function call "irlmp_unregister_service" To: "David S. Miller" , Samuel Ortiz , netdev@vger.kernel.org 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: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <5638EF52.7030300@users.sourceforge.net> Date: Tue, 3 Nov 2015 18:30:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:LrVfBZMWTcr1sbYYUTLa4GwAQ5ixD7kou7taoA/Y9MyerrCYzGG MbI2ZWYCVvNITi13YaOSPNdD4om2m6pvEgS8zZ61Jf48bCy1zgDoxdU/dM/4FhmJ0gNHV8V hbFhuDbHxRLnw/4YuovqeGyK77Wqh88tgpDxwoqdWphz17BrNoWDml52prl3XBvhJOOzBem kWqd2g11tUvETV1ByqTDw== X-UI-Out-Filterresults: notjunk:1;V01:K0:a1QExXPFwMg=:oHVq6Y5H5u/KlpBXnqxlqe k3l8UKu3VtoiIjhjZWE50qqvBwMUh3oYNeE8g1BtWUgFnfaDn31yru8WR5+Kkv6g4J6L8lkWy OlWAogGHx4QerctbCAuWa0adhQFtPYpq/B+EfUZqB5gWz/SFEZDDJsUE/Vvqy4sawEx4AU8Fr TIpMLTG8BE4hIIgk2xqHz3KvDrpKnV6TDv/GLAzqAs0Ci/lQQ45Dt6M4PYKIfgPyps2fWHg+n flkxiAA1E2QGChNgqXhQ9Esp9FdnCKxZkO3rO+TvnqL5mwBD/oslcblfqurXxgkEBg0JghpIK 2WOTZgCYNsZYLDKbH4n0n/ETEnfXfgUOtSMwlbaEF0r8jMxWf2N6Ts8kjBlhQ+NcFnGo55lYm hT+BvRB8ae31r/s3CO0TkyXeOv9mFuIzp+XaR2tPGZG+UItEfgi+7HiDla8zTedEuoLwTv2Ny aWDKfQaCWiSa24Y20+H9dThY1IjnLHhHfK5QLdtQ20EEMDj41L5SvYdDroqa1dEpHipktDfbM 5PU/f+Wz/UBmIzL0K5fLsKaB7LqX4pYSX69547Vd0zfaH0Qj+J8jLrJNFOPOz7I/Ghu6M25Zy ihffW2cBEktTqoD587aGjwTAs2kCJkh1dB0YZURdm3m6r/jrLviz+ZVWFJ7K3/wVCptyyvQz9 dxwRZhO2NoFLiYwNkIlotEnfWK+CPiV1ua+Q3xArUZOKguR+aO6zGn+Uw9gvQyNt7cmIQmaQw lfWlBc3mLTjEkSmB7vtLV+JD6zteHkaPJchEsmtqTvcckukUnEBi9+6Qp9fYTd55UJQBNkVCy JLErLZq Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 3 Nov 2015 18:18:37 +0100 The irlmp_unregister_service() 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 --- net/irda/af_irda.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index fae6822..e6aa48b 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -2123,8 +2123,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, } /* Unregister any old registration */ - if (self->skey) - irlmp_unregister_service(self->skey); + irlmp_unregister_service(self->skey); self->skey = irlmp_register_service((__u16) opt); break; -- 2.6.2