Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55907C43461 for ; Mon, 14 Sep 2020 13:09:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0400121655 for ; Mon, 14 Sep 2020 13:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088956; bh=4Huc6wP/TM0jMUXhAkmmGNdDt3SE4QmP5DHor4DjrEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oKDkm34Xt+V9bRWhC8QNE9doE0dkfLsOAOrkcZdWj6nMjf0J/nghHlYRWCDN4Kboz 2qnKmHVy4IhDs2p1049JloWvc1/FDaccFXuZofqzRww1dNa5ywX7N5UyNNgfTE1RUE g6FGxkksbZ08GAdGJS33fQuLQc8bTKro8IwmCnHc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726300AbgINNIt (ORCPT ); Mon, 14 Sep 2020 09:08:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:32878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726572AbgINNHQ (ORCPT ); Mon, 14 Sep 2020 09:07:16 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BF7E522248; Mon, 14 Sep 2020 13:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088767; bh=4Huc6wP/TM0jMUXhAkmmGNdDt3SE4QmP5DHor4DjrEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CIoo4BjpYe8Mh6gCQJfIT6WQuNpXWTVS1y8QWDl+VxjiK5xRWP4PnXEQ8mR2ulu56 Oh02jt++741xCiVDFAMJ9e0IiSWOfRDhSyXTrxnRKzA+FShU7YxCHB6+s656THqEOs mCDQIX6OwF6ysAY6N2KAKmbSabAdS1Zf3+i40VCI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andy Shevchenko , "Rafael J . Wysocki" , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 4.4 6/8] kobject: Drop unneeded conditional in __kobject_del() Date: Mon, 14 Sep 2020 09:05:56 -0400 Message-Id: <20200914130559.1805574-6-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914130559.1805574-1-sashal@kernel.org> References: <20200914130559.1805574-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andy Shevchenko [ Upstream commit 07ecc6693f9157cf293da5d165c73fb28fd69bf4 ] __kobject_del() is called from two places, in one where kobj is dereferenced before and thus can't be NULL, and in the other the NULL check is done before call. Drop unneeded conditional in __kobject_del(). Signed-off-by: Andy Shevchenko Reviewed-by: Rafael J. Wysocki Link: https://lore.kernel.org/r/20200803083520.5460-1-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- lib/kobject.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/kobject.c b/lib/kobject.c index cebbe79d2c65c..d278ad01ea660 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -568,9 +568,6 @@ void kobject_del(struct kobject *kobj) { struct kernfs_node *sd; - if (!kobj) - return; - sd = kobj->sd; sysfs_remove_dir(kobj); sysfs_put(sd); -- 2.25.1