From patchwork Tue Mar 7 07:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 65313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2299994wrd; Mon, 6 Mar 2023 23:54:16 -0800 (PST) X-Google-Smtp-Source: AK7set9/lr+YhjvEG9PuM4mvGvyG1652ILwETHwAPnW0UGct53X0qYIOyt+aD2B4zjpQ13Ndw/hX X-Received: by 2002:a17:902:d501:b0:19d:1a8e:836f with SMTP id b1-20020a170902d50100b0019d1a8e836fmr15338033plg.27.1678175656681; Mon, 06 Mar 2023 23:54:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678175656; cv=none; d=google.com; s=arc-20160816; b=FjmkmsNRn0Qf66fo/zQgbt1/h6H4uqxGQ+OXTcAhiUHeG33Ep4imrYoyofo7iXpeqy c8Cfil8TooQPJqzXpaJE2fJH+d5XgXAWP4daCJRy/V+45CU4wh/aPGpd3aapeO7ffXbm mcotZ9P810Lx49RUYa/OnMHBYomv98WWvpolI1acYiwupWV/RA1QRZ2rLNiAuGQ6DOLq PvDdm9qhfyGhBgjg430pgSJfPubHtdwpS/szT3yPUM0WlKA0kddiORVB3UXHhFh3TsiX RlNjXMNL4nEKuzSE6Syxkcms6xFKnQr8tHU6OBL0S1uhunof4RZp9WUAX3Z/Z6PyeU7N dsjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=CiVSZ042JNZixY/o3BhuWxrkEY9Ny69OOGaJg00NmIQ=; b=KZgEUTS3K+W99WTy9sRkFzUsASrYkmc4rs7lotqhV2MGnOALQO9/0viBNVuDD3wyTQ F9gIn0YcLb9iie4+rEcVX0ddcvneFDh0hfEMwf0HEwhqOPjd1dEI1KA3scwmR24nyA02 JuqCDK3B6rsvIx8Zp45sLOfSYvOLvIwnmMVrVU7T/5rcx9731tCHT0VOyS9ClgFk2lMW iYz1EiSzd/JXwDkG1UcDZCmJm9ddVib//f5OkrtMcBIKJKGUYSMadzXN1gIB0ikJRGsz o6PWGZorf0K47swwkau5t584rwYOWHGYo7O3UQL0Mbcjwz+KyAdx/dK9d1qrQcI8a9O/ ZI5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UblaqUjB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q21-20020a170902bd9500b0019e2729363asi10909053pls.405.2023.03.06.23.54.04; Mon, 06 Mar 2023 23:54:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UblaqUjB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229635AbjCGHv6 (ORCPT + 99 others); Tue, 7 Mar 2023 02:51:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229527AbjCGHv3 (ORCPT ); Tue, 7 Mar 2023 02:51:29 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D5A38617E for ; Mon, 6 Mar 2023 23:51:07 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 597D660BA5 for ; Tue, 7 Mar 2023 07:51:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CCAFC433D2; Tue, 7 Mar 2023 07:51:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678175466; bh=EHSYx70OmALyZKpquN+PuVafSdwvNOxA/K6t/OhikYc=; h=From:To:Cc:Subject:Date:From; b=UblaqUjBSJTigui6gYHI0abjrdRdNd+6Z5lqtsDVEGLLcpxlsA+DsYJdUDIS2K1Iq 3JIZM0/fMJD/sBqSIak29ZfcNiyIfR015QGdld9OpjXH25PVsoO+WHftd/IIiij0Il XV+3gaLsIzthKAO5ruSDUxe+awjTXwMw0Pa1ym6A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , Stephen Rothwell Subject: [PATCH] driver core: class: fix block class problem when removing CONFIG_SYSFS_DEPRECATED* Date: Tue, 7 Mar 2023 08:51:02 +0100 Message-Id: <20230307075102.3537-1-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1344; i=gregkh@linuxfoundation.org; h=from:subject; bh=EHSYx70OmALyZKpquN+PuVafSdwvNOxA/K6t/OhikYc=; b=owGbwMvMwCRo6H6F97bub03G02pJDClsb55cy83cf63rgKLz4b/Suif5TcMetSdFpR1dVFH8cdLi DaelOmJYGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAiZtwMC/ZVLJn1dp8av73ylPY/Hl +cPxbPF2GYsT//YduL/QK6yQbSs+4EPGvgcNIEAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759694717143081206?= X-GMAIL-MSGID: =?utf-8?q?1759694717143081206?= In removing the CONFIG_SYSFS_DEPRECATED and CONFIG_SYSFS_DEPRECATED_V2 config options, I messed up in the __class_register() function and got the logic incorrect. Fix this all up by just removing the special case of a block device class logic in this function, as that is what is intended. In testing, this solves the boot problem on my systems, hopefully on others as well. Cc: "Rafael J. Wysocki" Reported-by: Stephen Rothwell Fixes: 721da5cee9d4 ("driver core: remove CONFIG_SYSFS_DEPRECATED and CONFIG_SYSFS_DEPRECATED_V2") Signed-off-by: Greg Kroah-Hartman --- drivers/base/class.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/base/class.c b/drivers/base/class.c index fb8f2a1e1c19..5983eead8391 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c @@ -178,13 +178,7 @@ int __class_register(struct class *cls, struct lock_class_key *key) if (!cls->dev_kobj) cls->dev_kobj = sysfs_dev_char_kobj; -#if defined(CONFIG_BLOCK) - /* let the block class directory show up in the root of sysfs */ - if (cls != &block_class) - cp->subsys.kobj.kset = class_kset; -#else cp->subsys.kobj.kset = class_kset; -#endif cp->subsys.kobj.ktype = &class_ktype; cp->class = cls; cls->p = cp;