From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mout.web.de ([217.72.192.78]:60945 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752914AbcGSSCd (ORCPT ); Tue, 19 Jul 2016 14:02:33 -0400 Subject: [PATCH] [media] v4l2-common: Delete an unnecessary check before the function call "spi_unregister_device" To: linux-media@vger.kernel.org, Hans Verkuil , Mauro Carvalho Chehab 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> From: SF Markus Elfring Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Message-ID: Date: Tue, 19 Jul 2016 20:02:10 +0200 MIME-Version: 1.0 In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: From: Markus Elfring Date: Tue, 19 Jul 2016 19:54:16 +0200 The spi_unregister_device() 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 --- drivers/media/v4l2-core/v4l2-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c index 5b80850..57cfe26a 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -291,7 +291,7 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev, error: /* If we have a client but no subdev, then something went wrong and we must unregister the client. */ - if (spi && sd == NULL) + if (!sd) spi_unregister_device(spi); return sd; -- 2.9.2