From patchwork Mon Mar 13 18:28:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1346379wrd; Mon, 13 Mar 2023 11:45:09 -0700 (PDT) X-Google-Smtp-Source: AK7set/Oubp0Cicc7OnDZVILtAM49YxaB7dJHFJM1rrDUBIbN1cf+8lVcOc27mqhd217YVcPWiVi X-Received: by 2002:a17:90b:1e09:b0:237:e1d2:c65e with SMTP id pg9-20020a17090b1e0900b00237e1d2c65emr37357989pjb.4.1678733109312; Mon, 13 Mar 2023 11:45:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733109; cv=none; d=google.com; s=arc-20160816; b=f3ndLAjoauUj7g+NPdXQNM+pf53/+Lb/zxQptx4XEDKDR1qB02veAohONN/Ks+5T7n fBJRveol7zZkCEWmKEhPDmi9lYGza3dB9/NalHgHvvzIxVrJQij5pG0QHWp6UiR6G9eh /twt+4uYvZtQB8DktapB3n/ltZwoutHnDXPVpT2+T5K9+kG5n5f69cMccHuFGlloXaWl WxLHdszN+sAQOFc1mijyHXcZ8xqrbQeNfUuRI9xt92m/VQwNn7c2jKvu8NsyaRTJMoID +f2e6t4Yv3bfxgi7egTkJnKeLuA5IWu/1UMMbb+nrXLGJgpA1yg4v/eagth5i7+e8UTC H4hA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KtgW2IxB5Qu2TIAIX9duGoDGr5105JUxeL2Gzoodci0=; b=mEJtTdIJBGlsQ885/uzwRujWFSoPkeBVr/jlL5U2tD1NdTwZ7W4VBm0U8BHdvFcluK b+Q4+h96dI7l9RlK5NsQq6YgkUIIX1/5DvKPzt9LvXB8uW1t2yI6FpVwOF1uGTbs+Qcq eOTv3hz002mdvr5t6s7KqEvVMJ51TAS+L1hBJiPUmsrSGH4oMEPKBcbuSKlNjGjPQleE sO5qwI+4wEKPr1mB520SAuTekmn3qLBba9jGjApO3pYMd8Vtd39k2Ej1L0LFfjhsry/+ aQGXieRXNkKkinPxD/tInrB/n/7LDvpSExXyPa4P5viLCil/tMrJ06XgQNniucwo1eJA G4Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=okHtIWSW; 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 j16-20020a17090a7e9000b00237413f8c6esi341117pjl.154.2023.03.13.11.44.56; Mon, 13 Mar 2023 11:45:09 -0700 (PDT) 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=okHtIWSW; 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 S231191AbjCMSbc (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231148AbjCMSay (ORCPT ); Mon, 13 Mar 2023 14:30:54 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9B197AA7 for ; Mon, 13 Mar 2023 11:30:26 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 6D464B811EA for ; Mon, 13 Mar 2023 18:30:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9939C4339B; Mon, 13 Mar 2023 18:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732210; bh=+YNkgrwftY9hNEquBq/R0SACBur2SPzGk0mDyKZ5lx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=okHtIWSWvjP6x5fU3oAPAe28nKfepeMrYZE5gY44jigwo8Pvy+eFSWGY1iKI7084c eMJD8wiSOfUIW9x7X49LQ+8Y7WVN1aNZfFGpuajpT74d/A4XzeTDb+ESW3l9gqZaae REtLOq/OsvUMQzFZNWfGSbFjznNHPfmtc3eVaD4E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Thomas Gleixner , Valentin Schneider , Phil Auld , Steven Price , Juri Lelli , Vincent Donnefort , Kuppuswamy Sathyanarayanan , "Jason A. Donenfeld" Subject: [PATCH 07/36] cpu/hotplug: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:49 +0100 Message-Id: <20230313182918.1312597-7-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> References: <20230313182918.1312597-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2278; i=gregkh@linuxfoundation.org; h=from:subject; bh=+YNkgrwftY9hNEquBq/R0SACBur2SPzGk0mDyKZ5lx8=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82WVXq/7d+B2dX5lz5v3EZVFBndty901+w2ix6kzpR Z25s9VDOmJZGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAid9UY5vs++fYyJs9zXcVc /QmiC8tnv/J5859hwYK2x0G6ld+vWt9xu+etX3nmloTaOgA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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?1760279249195525792?= X-GMAIL-MSGID: =?utf-8?q?1760279249195525792?= Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Thomas Gleixner Cc: Valentin Schneider Cc: Phil Auld Cc: Steven Price Cc: Juri Lelli Cc: Greg Kroah-Hartman Cc: Vincent Donnefort Cc: Kuppuswamy Sathyanarayanan Cc: "Jason A. Donenfeld" Signed-off-by: Greg Kroah-Hartman Reviewed-by: Thomas Gleixner --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. kernel/cpu.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/kernel/cpu.c b/kernel/cpu.c index 6c0a92ca6bb5..c59b73d13a3a 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -2569,22 +2569,33 @@ static const struct attribute_group cpuhp_smt_attr_group = { static int __init cpu_smt_sysfs_init(void) { - return sysfs_create_group(&cpu_subsys.dev_root->kobj, - &cpuhp_smt_attr_group); + struct device *dev_root; + int ret = -ENODEV; + + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + ret = sysfs_create_group(&dev_root->kobj, &cpuhp_smt_attr_group); + put_device(dev_root); + } + return ret; } static int __init cpuhp_sysfs_init(void) { + struct device *dev_root; int cpu, ret; ret = cpu_smt_sysfs_init(); if (ret) return ret; - ret = sysfs_create_group(&cpu_subsys.dev_root->kobj, - &cpuhp_cpu_root_attr_group); - if (ret) - return ret; + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + ret = sysfs_create_group(&dev_root->kobj, &cpuhp_cpu_root_attr_group); + put_device(dev_root); + if (ret) + return ret; + } for_each_possible_cpu(cpu) { struct device *dev = get_cpu_device(cpu);