From patchwork Mon Mar 13 18:28:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1347301wrd; Mon, 13 Mar 2023 11:47:37 -0700 (PDT) X-Google-Smtp-Source: AK7set9s3/8zNlI5b34ZE0uwptLKuVBimVqZ64cicKHsno+AN02nCTHIc31xGNxQb4ZrxSThpfhI X-Received: by 2002:a17:902:d4cc:b0:19b:dbf7:f9ca with SMTP id o12-20020a170902d4cc00b0019bdbf7f9camr44738932plg.0.1678733257687; Mon, 13 Mar 2023 11:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733257; cv=none; d=google.com; s=arc-20160816; b=G8UFHf0DF1aeJXKl7FWkvdAgOQRUKOXueOOrxqjwV6C0iwQudAS3o0mrAtzv0vxIys 2XbvgIP5tALLnC7GNJjqelisV/NwEbjxbdqZfz1+qheGE4H7JrkDIW7f3N/HrHwI8akI 0alK8hA2NzIWIOkKqJCN979FyftcvnnU2E+qdTgg4o8g9aYO1w8RmiQdC2/c8OnLHWAe Bo7HX4SNADHfyDIzzoflD+gp5W9IZIkyqSWB9nk6W+iHU4ajRW/kKpucV+amA6L2sRnu icDWyepoFw5Obia9o1IhQxrDL2THovhDFvz0LGY+YxfcB9VY7WLFl8v6J50Yz2Vux8SD egXg== 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=ADkuL2US46VAy8SSXi59ANb0B1ASkm59oAINZ70BTt4=; b=xqM9ESQpgA6qAB0veX4ga3A4HOQzfaA+lKCOuWEAldSb8aR4Vcchok27CmfxQkTqey zwV0S5nd/mlgo96Sp5USc8z5EyIKL0kaRBH5xCv4l2qLHNO55GKNBFbR1EMyoA9dSQsl 5HexAOGgHzmQ5pmK+AhAbi3qL5DVb1/5hSJ5FvFPf4CBXhGgdnfPLeZVceyCOWtcQg/4 lHvJiolm1TJITUHU81VEtSLxpkxtoG/4WvrXLR9h2O9ahXoD+9+2TBMBvm2Ow4PcGKGE ob+rzoPMsvXoZUUBVGbihXqHaPhgY4x9ct9ihVUHrrK+0gx3QS1VOLFK1PYeyqjMNzeK D8bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kVeSIl1u; 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 kb14-20020a170903338e00b0019ab44c2168si338246plb.382.2023.03.13.11.47.24; Mon, 13 Mar 2023 11:47:37 -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=kVeSIl1u; 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 S230430AbjCMSbs (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231159AbjCMSbG (ORCPT ); Mon, 13 Mar 2023 14:31:06 -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 0C18E848CE for ; Mon, 13 Mar 2023 11:30:40 -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 D422DB811DC for ; Mon, 13 Mar 2023 18:30:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 449EDC433D2; Mon, 13 Mar 2023 18:30:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732219; bh=qGruADsKF1ycq4BqFQi55JPLcBS063gUsHShmvuxofc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kVeSIl1uLbrNAG9OvhZVRP5TAC/Be5RiN4cO8MomaHofxtAPI9dr8zvuVEgaovoEZ J8KuO0BHfW3R5yOmE4r0ClORCCZUrjZtrbTxI1gDnyvZA3F6XNro0GF4mCCBLFxKFf tRbewAXlsh7winx7MpWIV+Phl1DgMYUK7BvK4V5I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Subject: [PATCH 10/36] x86/umwait: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:52 +0100 Message-Id: <20230313182918.1312597-10-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=1598; i=gregkh@linuxfoundation.org; h=from:subject; bh=qGruADsKF1ycq4BqFQi55JPLcBS063gUsHShmvuxofc=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82eWXbG2fTvW7oGJoJ8wVLXSwcOotXR3RhGzPFtbHb y39yio7YlkYBJkYZMUUWb5s4zm6v+KQopeh7WmYOaxMIEMYuDgFYCJnhRjmpwp27xM4ctFKr2Op HOf9lgcxE6SbGRZcqeG93/Lc/NnvjxkftL705Kx7UfIQAA== 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?1760279404166857932?= X-GMAIL-MSGID: =?utf-8?q?1760279404166857932?= 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: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" 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/x86/kernel/cpu/umwait.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/umwait.c b/arch/x86/kernel/cpu/umwait.c index ec8064c0ae03..2293efd6ffa6 100644 --- a/arch/x86/kernel/cpu/umwait.c +++ b/arch/x86/kernel/cpu/umwait.c @@ -232,7 +232,11 @@ static int __init umwait_init(void) * Add umwait control interface. Ignore failure, so at least the * default values are set up in case the machine manages to boot. */ - dev = cpu_subsys.dev_root; - return sysfs_create_group(&dev->kobj, &umwait_attr_group); + dev = bus_get_dev_root(&cpu_subsys); + if (dev) { + ret = sysfs_create_group(&dev->kobj, &umwait_attr_group); + put_device(dev); + } + return ret; } device_initcall(umwait_init);