From patchwork Mon Mar 13 18:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69052 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1354572wrd; Mon, 13 Mar 2023 12:04:33 -0700 (PDT) X-Google-Smtp-Source: AK7set+x15MAoBHAriCIwhh0KCUXO550ecSCChY+iQeODppdNOZUk+UXVeiqzsO16nWMnByd+h0Z X-Received: by 2002:a62:794e:0:b0:623:84d9:4c8 with SMTP id u75-20020a62794e000000b0062384d904c8mr5983324pfc.17.1678734273567; Mon, 13 Mar 2023 12:04:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678734273; cv=none; d=google.com; s=arc-20160816; b=uRYqNaxn9LZeq49Qkc+wBEauCT6Prnh96uk8q3Bye8yTqOmmvhoTOS02wnBTa4SiK9 5xZDn0YmponfDUUDuQ82PsCLnypVAjzI4vVMtR0nJXE5JMFqhf5xqaN6SUPf4I6bSbhK 2i3da2MJVJnwLLbsg0WoMFLeMd3K6zAPGmPKhiOeOocakdhrYC6fKLTu+yeWLW9z0psP 42rbxBZqJq71pfROhaKv/DC4zcdKX9ZnIf7z+qar1wkPt8/T5KcWV7fKB3BRWpTjjMXo n9nx1WDfEtjk7suFWUZsNAIzZmnLtrYyeHLWTAnxqK+7h+QyfMYJmQMfndqsXFqkBKGE HNgA== 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=3tKA2a1Mny6uOhTdV5G4YZKcWCfAFXD/biTdTfLcia4=; b=ej2QFTDPT8jMGI2CzkcMuvLv+lrchiyx75arMi3XcB+QDU3Db7WLfx2fkkGbqiiLjZ 8u/t9qnPqJpabI5WTF+IVFnZuJ/YheVPUvT3dXpo0vpN2lOawzwKO8H7Huxo0t04fNLI I1ZU05yJX4EXNK21FafWG2yRL0N/ihm9JInD5Wp5SPaPecsEM4mkgv0coLIkHaXgNu3+ pClHF4VC5yaKEQZ1FzBMmRKzjtKqEXMUohNqez2CKBca8qFA+go9ihl30yUlPITzpTan JcV7FZtbcFtmfa5XRq2z2nTT9OFPB07AlyoPBKDj9d4s+TlGK+BPWma7LU2fa0Z7q8Hf 5qRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=N6WvZTgn; 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 bs126-20020a632884000000b005074cff89c7si192159pgb.421.2023.03.13.12.04.20; Mon, 13 Mar 2023 12:04:33 -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=N6WvZTgn; 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 S231401AbjCMScy (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231231AbjCMScS (ORCPT ); Mon, 13 Mar 2023 14:32:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4126785349 for ; Mon, 13 Mar 2023 11:31:13 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 4E85461486 for ; Mon, 13 Mar 2023 18:30:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EFB9C4339B; Mon, 13 Mar 2023 18:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732212; bh=29/VsP7QLy9amuWzKxZWbyxjbLYD3mVtVi2dWWJd14U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N6WvZTgnyjdnIciW+XJpqREAg/Sv8CNZ5h7L49crFuJX9JpZK557g+J2i6Rcj0+lH HB0ldD4o4+vDS7opAYeEgo4MehXRRg9H5eQlp8Ul+Ifl+nZhUHaZMVl9PtOPNmV6Pn xR4klK47fvEJw/UgeP5px6cwCi1Q8Qw7JTWTGJq0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Tejun Heo , Lai Jiangshan Subject: [PATCH 08/36] workqueue: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:50 +0100 Message-Id: <20230313182918.1312597-8-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=1455; i=gregkh@linuxfoundation.org; h=from:subject; bh=29/VsP7QLy9amuWzKxZWbyxjbLYD3mVtVi2dWWJd14U=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82WXzlwgI/9nCY/WtQDCZfW/SI+PPK5Rjuld+2JLiX tG9hTO1I5aFQZCJQVZMkeXLNp6j+ysOKXoZ2p6GmcPKBDKEgYtTACZybDLDfLc1Wydbs4mrXxSf EVkRH3udN37SbYYFa+4uceEWOGdeOs2gNlZ15Yq6d3vuAAA= 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 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?1760280469994753837?= X-GMAIL-MSGID: =?utf-8?q?1760280469994753837?= 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: Tejun Heo Cc: Lai Jiangshan Signed-off-by: Greg Kroah-Hartman --- 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/workqueue.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index b8b541caed48..209917792fa4 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5826,13 +5826,19 @@ static struct device_attribute wq_sysfs_cpumask_attr = static int __init wq_sysfs_init(void) { + struct device *dev_root; int err; err = subsys_virtual_register(&wq_subsys, NULL); if (err) return err; - return device_create_file(wq_subsys.dev_root, &wq_sysfs_cpumask_attr); + dev_root = bus_get_dev_root(&wq_subsys); + if (dev_root) { + err = device_create_file(dev_root, &wq_sysfs_cpumask_attr); + put_device(dev_root); + } + return err; } core_initcall(wq_sysfs_init);