From patchwork Mon Mar 13 18:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348017wrd; Mon, 13 Mar 2023 11:49:22 -0700 (PDT) X-Google-Smtp-Source: AK7set8hkIp1izbZPiWpMJmcgkFw/WIruCNsep5UjVnkExUfGjFuOC5e336sEAoKbMmZt8iu8jp7 X-Received: by 2002:a05:6a21:6d9f:b0:cd:a334:a531 with SMTP id wl31-20020a056a216d9f00b000cda334a531mr44268627pzb.62.1678733362581; Mon, 13 Mar 2023 11:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733362; cv=none; d=google.com; s=arc-20160816; b=S059k5nzX5lkDJQ+i2K0T1m6JFFMMf+TFeUUFIVsLlrd7YeVhr6vWZfrYUPIVJfcmR MV2odGeH9C+ynSxsr3z0xE0uYWG7T72VJ92YYaSruwqDhD4CRMpuA9iFJ9smjsG6uhhM lpkCtmri2R8BJb8gBSQO2YSMYU8NWdnvYkWZvKsNt8sBUaeyH3BS8AvHeqdbj7hy0ZCm gU+fAIo/KPLbuFrSHqBmuU/fWZem+tZVCgQ1fNjFvwneLJQBKd4V6MKSarIYAMVTEQjf xsMUuC6v6v/OFHwuuNFiCkrCHuOWHv+vNkcH+oxjoBUhnH2OB9bJLHdLYC9YDNKbTqv6 hSdQ== 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=cYsI90IFYugCYjdOGQLhxCHK2Lcmp2DcW95bLX4kiNM=; b=Fvbho1Zg2xWDfMDZkd/TH5DQ3lo3e3f/MgKaMAI5OvkFukxEKcO8vptLONqJ9QyGjK ODl00hYvevA2qMrAOePuw/L1xFpNeV+H3ko1F5X+8lhvlHJAL6AufDGjGsXcHogVO2Gb J/4o5+E+j4r/UZxpcuBxl9vS76BYBUEMu8fEIrHA/RCx5/shbQC6WLpKib1HeVTjc8OW xpNo6ibM33BDWgaGdLTALU00Crl8SgDX7hpMulU8XUWcHRW2HX+Q+9Z7EmWgMrhaPPo6 0eEz56JlxMdsiGFrd94N/WTpTqCeolW8+/TLQJI5g11NqDFBTcXxMvuVV/cOgVRttEmk UB2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sia3eX1j; 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 70-20020a630449000000b00503355265d2si136889pge.733.2023.03.13.11.49.10; Mon, 13 Mar 2023 11:49:22 -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=sia3eX1j; 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 S231299AbjCMSbJ (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231232AbjCMSaq (ORCPT ); Mon, 13 Mar 2023 14:30:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E955283888 for ; Mon, 13 Mar 2023 11:30:16 -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 320026147E for ; Mon, 13 Mar 2023 18:29:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49B4BC433EF; Mon, 13 Mar 2023 18:29:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732175; bh=Wkc8ouE8preZxxsKKr+mW1QCYOu2NrmhAiEHH6XrvJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sia3eX1jTyd6HFboYPForq+DFhgzXjzHJFJ3CKNpgDiTkRxSnzdvetgUuSrR3REvZ rxPHW7vLDroW30cVO3GV2OI7dbkenunW4WplYf0LDGfmbf5owZQ6HmMIcuI8Tm6pBz 7qjswwHmKBucIQRmxi1knQDyNLlUJx+AHYzUWOZg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Wolfram Sang , Joel Stanley , Liang He , Julia Lawall , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 13/36] powerpc/powernv: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:55 +0100 Message-Id: <20230313182918.1312597-13-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=2991; i=gregkh@linuxfoundation.org; h=from:subject; bh=Wkc8ouE8preZxxsKKr+mW1QCYOu2NrmhAiEHH6XrvJ8=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82RWCF9Rn1zBn9X5d7J6Rft93Kr+jnp/wnO+Vhd8UB VeobDLsiGVhEGRikBVTZPmyjefo/opDil6Gtqdh5rAygQxh4OIUgIlsWsgwP9NjR1XwN4/5VgsS ll189TA8doHhEob5OXZX70gzLd+byRTa9f3E230vXay9AQ== 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?1760279514267073145?= X-GMAIL-MSGID: =?utf-8?q?1760279514267073145?= 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: Wolfram Sang Cc: Joel Stanley Cc: Liang He Cc: Greg Kroah-Hartman Cc: Julia Lawall 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/platforms/powernv/idle.c | 9 +++++++-- arch/powerpc/platforms/powernv/subcore.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index 841cb7f31f4f..6dfe8d611164 100644 --- a/arch/powerpc/platforms/powernv/idle.c +++ b/arch/powerpc/platforms/powernv/idle.c @@ -1464,14 +1464,19 @@ static int __init pnv_init_idle_states(void) power7_fastsleep_workaround_entry = false; power7_fastsleep_workaround_exit = false; } else { + struct device *dev_root; /* * OPAL_PM_SLEEP_ENABLED_ER1 is set. It indicates that * workaround is needed to use fastsleep. Provide sysfs * control to choose how this workaround has to be * applied. */ - device_create_file(cpu_subsys.dev_root, - &dev_attr_fastsleep_workaround_applyonce); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + device_create_file(dev_root, + &dev_attr_fastsleep_workaround_applyonce); + put_device(dev_root); + } } update_subcore_sibling_mask(); diff --git a/arch/powerpc/platforms/powernv/subcore.c b/arch/powerpc/platforms/powernv/subcore.c index 7e98b00ea2e8..428532a69762 100644 --- a/arch/powerpc/platforms/powernv/subcore.c +++ b/arch/powerpc/platforms/powernv/subcore.c @@ -415,7 +415,9 @@ static DEVICE_ATTR(subcores_per_core, 0644, static int subcore_init(void) { + struct device *dev_root; unsigned pvr_ver; + int rc = 0; pvr_ver = PVR_VER(mfspr(SPRN_PVR)); @@ -435,7 +437,11 @@ static int subcore_init(void) set_subcores_per_core(1); - return device_create_file(cpu_subsys.dev_root, - &dev_attr_subcores_per_core); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + rc = device_create_file(dev_root, &dev_attr_subcores_per_core); + put_device(dev_root); + } + return rc; } machine_device_initcall(powernv, subcore_init);