From mboxrd@z Thu Jan 1 00:00:00 1970 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=unavailable 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 6657DC433E2 for ; Mon, 14 Sep 2020 17:10:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25F9E21974 for ; Mon, 14 Sep 2020 17:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600103413; bh=Jpe/rsiCKdJ+48KmWbLzJ516lNH8QOlSQzvgrTbxLCE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z3VQzoutXibtX9lB0Gg/z+nqdP7JEmowd7TuWy8xc1c4ClJOUPzV/LriB0K5UmP5x FdNwKSTk6ifgq46szI+zs852DsfFKtC/7cDbK2BX/yP/SxKsVPkq+RnnR/6CVC1/fL SXgEEmzClPguG3UZQIJytjXTHGwJE97VcoNuZ3qM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726055AbgINRKK (ORCPT ); Mon, 14 Sep 2020 13:10:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:60694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726599AbgINNFF (ORCPT ); Mon, 14 Sep 2020 09:05:05 -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 44E71221E8; Mon, 14 Sep 2020 13:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088658; bh=Jpe/rsiCKdJ+48KmWbLzJ516lNH8QOlSQzvgrTbxLCE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fL/NwceA+CG1dMb1qB61ueAG2GGo+z5MKuTaRLFyFknVQS/KUEfaB6KsgNAfkUMIT Tvhb5/VTycf0MWCNJnvX9HvbPedQ9au+MDk94CvfgmklkFL83iJIaBy7S+4k0N/t3j I9ZSl0igkH6+NCoU9EsFfa3+lcNMTPufTBzRYww8= 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 5.8 17/29] kobject: Drop unneeded conditional in __kobject_del() Date: Mon, 14 Sep 2020 09:03:46 -0400 Message-Id: <20200914130358.1804194-17-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914130358.1804194-1-sashal@kernel.org> References: <20200914130358.1804194-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 3afb939f2a1cc..3a255f14e263e 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -604,9 +604,6 @@ static void __kobject_del(struct kobject *kobj) struct kernfs_node *sd; const struct kobj_type *ktype; - if (!kobj) - return; - sd = kobj->sd; ktype = get_ktype(kobj); -- 2.25.1