From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754632AbdBETlm (ORCPT + 2 others); Sun, 5 Feb 2017 14:41:42 -0500 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:28382 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754511AbdBET11 (ORCPT ); Sun, 5 Feb 2017 14:27:27 -0500 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Markus Elfring , Greg Kroah-Hartman , Willy Tarreau Subject: [PATCH 3.10 177/319] driver core: Delete an unnecessary check before the function call "put_device" Date: Sun, 5 Feb 2017 20:19:59 +0100 Message-Id: <1486322541-8206-78-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1486322541-8206-1-git-send-email-w@1wt.eu> References: <1486322541-8206-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: From: Markus Elfring commit 5f0163a5ee9cc7c59751768bdfd94a73186debba upstream. The put_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 Signed-off-by: Greg Kroah-Hartman [wt: backported only to ease next patch as suggested by Jiri] Signed-off-by: Willy Tarreau --- drivers/base/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 2a19097..d92ecf3 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1138,8 +1138,7 @@ done: kobject_del(&dev->kobj); Error: cleanup_device_parent(dev); - if (parent) - put_device(parent); + put_device(parent); name_error: kfree(dev->p); dev->p = NULL; -- 2.8.0.rc2.1.gbe9624a