From patchwork Mon Mar 13 18:28:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69040 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348001wrd; Mon, 13 Mar 2023 11:49:21 -0700 (PDT) X-Google-Smtp-Source: AK7set98K9jtjA3yIZpzqgcX5R9GWDg1Iof3BDvmsE5d1n+MD6eGCzeCCktzWGnnQ4tOscXlpqRd X-Received: by 2002:a17:90b:3846:b0:230:fac8:d7e7 with SMTP id nl6-20020a17090b384600b00230fac8d7e7mr34677505pjb.2.1678733361184; Mon, 13 Mar 2023 11:49:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733361; cv=none; d=google.com; s=arc-20160816; b=tzSBL0pQqOsAiGgYRzznOMEdVPUBJEWT/W4oxgaZk3RbfVsirnpGmAMD+BNF/R6Nkc WfwfJNA1V0r9DhSqe2PmIcYnDUIWDmaiakw5j0e6E1sKxsQS/RUjlLlzx7ihUNf0rrb9 HPJ7gOwo8mzahG3ejTcy866nP/c7rQILfwETwPsPDmzGoc8F1YUJEy4FKLZfhYddrOmT 2Vytn93ve6CRZPsOZ0OR9M6K8+/+iIRb35wtftGGx9FMPMm9mmpezBMVn6DgskQg4TwU B7StsTBuC1E5NU4k88eKH5XL4nQp81POJ5daIqk5NhzTGu8he5VpD/vVMU8iKonel4xH 0zxg== 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=5RFndU86DO2+ij9HZ1Ba4zLuof4yQXYoU8DEZC8wpRk=; b=u88h5H+LQW0cEIfqGJIpujgsOSyzrG2ORbaTa0gM9S+WSguUvBbg9i/DuKdrTOnCPQ fcpyeC+YKHwspZldPRriLzuURgmV8/6fSfhsLSXvIW1mZyJ/tLCCNCFlFvAM+7mkja00 KgBOBveUb/Hi+9ecTH+I3Nwk8vxRR/agmMzLuVvuhhw+cKSuXJ59xSd/AdHIvWIMlP3n ZQX47fpTqty+7nBVRN91QbSKTsGfIdtwMVSwOCDf7ow5ucC8SlyytkSFYPj0r15mE8gy picgFW7NJtWolsxarsbLQS8CreaHFYTsIvRFRwV8Gj147rOI9cNMubrdcIuXoUa4IpQ+ 8WuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wjYC2fVs; 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 w9-20020a17090aad4900b00230ca3efcf3si354218pjv.158.2023.03.13.11.49.08; Mon, 13 Mar 2023 11:49:21 -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=wjYC2fVs; 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 S230496AbjCMSaY (ORCPT + 99 others); Mon, 13 Mar 2023 14:30:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230291AbjCMSaP (ORCPT ); Mon, 13 Mar 2023 14:30:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C076D503 for ; Mon, 13 Mar 2023 11:29:49 -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 7E67E61481 for ; Mon, 13 Mar 2023 18:29:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E072C433D2; Mon, 13 Mar 2023 18:29:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732172; bh=GZi6aIFaPbxyiWC7UgPxZNnPYWjFOCtg9+DHkUvetJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wjYC2fVsQqfI5jh0QjqMMazt/qp4hQhyThWH9kCVBnHP1bow+OIbEgfcq3ow8wBJc zD42zt3S7WDI0mpOSupC59RB09h7Or69T0tSWWIo/DotEOx1J+jhb/MPlgBQ3dhTgB XYzC3m5S//TVyAc0td0hGo9n6uJJDpSOsvNO69OI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Michael Ellerman , Nicholas Piggin , Christophe Leroy , David Hildenbrand , Andrew Morton , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 12/36] powerpc/sysfs: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:54 +0100 Message-Id: <20230313182918.1312597-12-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=2139; i=gregkh@linuxfoundation.org; h=from:subject; bh=GZi6aIFaPbxyiWC7UgPxZNnPYWjFOCtg9+DHkUvetJc=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82eVP0u/d4E282/La+Y9Ge8br9zerjNax/HkmpCth9 X/H228nO2JZGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAiYRwMC/b3P2fd75zX8XC9 8Nc57tnK866IszHMs1O3/T3dc4P9K86TE1i3JX65nm+wDAA= 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?1760279513343874919?= X-GMAIL-MSGID: =?utf-8?q?1760279513343874919?= 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: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: David Hildenbrand Cc: Andrew Morton Cc: linuxppc-dev@lists.ozlabs.org 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. arch/powerpc/kernel/sysfs.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index ef9a61718940..0f39a6b84132 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -217,13 +217,18 @@ static DEVICE_ATTR(dscr_default, 0600, static void __init sysfs_create_dscr_default(void) { if (cpu_has_feature(CPU_FTR_DSCR)) { + struct device *dev_root; int cpu; dscr_default = spr_default_dscr; for_each_possible_cpu(cpu) paca_ptrs[cpu]->dscr_default = dscr_default; - device_create_file(cpu_subsys.dev_root, &dev_attr_dscr_default); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + device_create_file(dev_root, &dev_attr_dscr_default); + put_device(dev_root); + } } } #endif /* CONFIG_PPC64 */ @@ -746,7 +751,12 @@ static DEVICE_ATTR(svm, 0444, show_svm, NULL); static void __init create_svm_file(void) { - device_create_file(cpu_subsys.dev_root, &dev_attr_svm); + struct device *dev_root = bus_get_dev_root(&cpu_subsys); + + if (dev_root) { + device_create_file(dev_root, &dev_attr_svm); + put_device(dev_root); + } } #else static void __init create_svm_file(void)