From patchwork Mon Mar 13 18:28:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69046 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1348632wrd; Mon, 13 Mar 2023 11:50:59 -0700 (PDT) X-Google-Smtp-Source: AK7set/SXCaIM86aauMRUR7CO5t0QFluywJw4VmGmh6/4ZK2rCnK8aqkYqEmyMK13f87L3sMNDj5 X-Received: by 2002:aa7:9819:0:b0:624:a58a:d32 with SMTP id e25-20020aa79819000000b00624a58a0d32mr3398131pfl.4.1678733459680; Mon, 13 Mar 2023 11:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733459; cv=none; d=google.com; s=arc-20160816; b=xdF26eiLimfUKJsKtPXurpCJE6Vbs6cUGa7RD0y9RRxsV2+bxeAGuwYY80fW9zA/ae T3TX1x14G7khRLnqZWgUSS6uAxsgyVfm5rU3bJfacvhDFhKPJ2fo4+6dNrs0XuwnWlBa G785FCTb6pw+Gef7jFNpuiODDHxfOoIk4Dspmo29CPsxP2TZXXP19Yw4E/SqbkZSm1B3 LPsULEfLWfP6sJzE0fJb2FzQT846LaqLA738wgIVajojU6XwMO9Dq1C4gZJ2OL+/schk kJeIV/Kqqj5WlUvZjiLeoHFYgi5N6JTLZa6VdXUkLbbwljG3uHazjyX/4WsXslcn8AP6 AE4A== 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=Fo6ScvWcTgGS2yu1ENiprpVicABBRrXRBNbKK73xDDI=; b=Z3bWIGlJM/hgJEd4ZGQYgsfV1eu5CEpazQ71w2SRyVv2lxgjG3+OrVufCSC+Fn0L5a sULfYlgw5E6B8bsk7Yw/r+CAolezAP9XiWcMEv9dmZky87e/UzUYi3s8rq+maxpOtymm d5h5iIG4rTR7/ZSVd1ctU9PJeApypQ8OsLZZX+WbPgUui8ZOv8hqgmJ5ecbO7Gn9JHim Nn53xCaQqg1JHUYctq7gyUMOnHovsw2nfyK5o2D2X5ox9fT9lj5CAigxclHVhMgTtlzi 6qXqCSXI/CXgKdsUmQ2Djao9axDbtbTOQ+C/zF2jao/FCM7bjRv+XSzJ6F0FLLLEJi2d mLqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1HRDHQyI; 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.50.46; Mon, 13 Mar 2023 11:50:59 -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=1HRDHQyI; 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 S231350AbjCMSbf (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbjCMSay (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 E61C225B81; 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 0EA29B811E0; Mon, 13 Mar 2023 18:30:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77C7EC4339C; Mon, 13 Mar 2023 18:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732204; bh=7dR6cgnoc5L5P7fViXWBZ/SR4m9IirhaXpa6nNyHMUE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1HRDHQyIUW6F//NrwkovKrkyEyPTWHsGMf1FPjZf6MyMnk7UjvPitAncqoHS9PtjS lJKQXZcblP9+4QO2xqW3MTrVU9mlJ5RkjHDdX77pKt2KVCEEQ/DDVdKiOhEWEdmqyl S0GXPBaMO3REmPNhZO/0K1POiRfFkPtpc1QkxgEE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Srinivas Pandruvada , Hans de Goede , Mark Gross , platform-driver-x86@vger.kernel.org Subject: [PATCH 05/36] platform/x86: intel-uncore-freq: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:47 +0100 Message-Id: <20230313182918.1312597-5-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=1924; i=gregkh@linuxfoundation.org; h=from:subject; bh=7dR6cgnoc5L5P7fViXWBZ/SR4m9IirhaXpa6nNyHMUE=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82WVuLWdOs8k7r5U84VfcscL86aEZjNVOp2KM6q99D awQvnOjI5aFQZCJQVZMkeXLNp6j+ysOKXoZ2p6GmcPKBDKEgYtTACbCZcUwP+3jldVJH+buKn/1 qdlTKcqyi73eh2HBMccEJ+bJ+zIUq998O9e2z+iRY95zAA== 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?1760279616145788318?= X-GMAIL-MSGID: =?utf-8?q?1760279616145788318?= 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: Srinivas Pandruvada Cc: Hans de Goede Cc: Mark Gross Cc: platform-driver-x86@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: Srinivas Pandruvada Acked-by: Hans de Goede --- 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. .../intel/uncore-frequency/uncore-frequency-common.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c index cb24de9e97dc..1a300e14f350 100644 --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c @@ -224,9 +224,15 @@ int uncore_freq_common_init(int (*read_control_freq)(struct uncore_data *data, u uncore_write = write_control_freq; uncore_read_freq = read_freq; - if (!uncore_root_kobj) - uncore_root_kobj = kobject_create_and_add("intel_uncore_frequency", - &cpu_subsys.dev_root->kobj); + if (!uncore_root_kobj) { + struct device *dev_root = bus_get_dev_root(&cpu_subsys); + + if (dev_root) { + uncore_root_kobj = kobject_create_and_add("intel_uncore_frequency", + &dev_root->kobj); + put_device(dev_root); + } + } if (uncore_root_kobj) ++uncore_instance_count; mutex_unlock(&uncore_lock);