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 C2507C433E2 for ; Mon, 14 Sep 2020 14:29:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D38A2193E for ; Mon, 14 Sep 2020 14:29:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600093782; bh=5VjjZjn7IDHSD+pHCCMmV5MP4ZgYmLZKLYomeCYNuAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dLKfA0rzU2PadCfEAk9jRNLScC9Od4GxmUY14LwEI6iEc1GZo4lljCKox7jNFfHO4 NwJP2pYrWv2prTS6tEFZ8ZgqWU/DimJZe+pTjgNZk1UfLLxDuOAzouQFYEocnEGdi3 ZFQrGSQKBCEvaHtHQCFICY2LWhB4HXyyp0P7Ac4Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726532AbgINO3j (ORCPT ); Mon, 14 Sep 2020 10:29:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:60804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726348AbgINNGD (ORCPT ); Mon, 14 Sep 2020 09:06:03 -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 531D822262; Mon, 14 Sep 2020 13:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088715; bh=5VjjZjn7IDHSD+pHCCMmV5MP4ZgYmLZKLYomeCYNuAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jyajp+nvuQyTJfVanEdosFhxxMLaCQYqy+OHApdGncv8O7cPdyZzSAftrjScCiFE+ KTt/HekTo9lorraxhnYBIfUNr8wnjzv1ZGhXHKM+t34MIU54lFHbGIYqUEkKk7gqBf DMeDcGgjGwbLSPvlhEgvfd89/8nTikeOoLq9mLHA= 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.19 10/19] kobject: Drop unneeded conditional in __kobject_del() Date: Mon, 14 Sep 2020 09:04:53 -0400 Message-Id: <20200914130502.1804708-10-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914130502.1804708-1-sashal@kernel.org> References: <20200914130502.1804708-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 97d86dc17c42b..6483c11e2e74f 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -585,9 +585,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