From patchwork Mon Mar 13 18:28:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1345049wrd; Mon, 13 Mar 2023 11:41:52 -0700 (PDT) X-Google-Smtp-Source: AK7set+W0Haaf/AU+dSGEGCEDUOXeaDLRKVGhThlN2+eaG9OhlcAc/Pd4mfCUaA0E314eiE6lA4H X-Received: by 2002:a17:902:eb4b:b0:19f:2d79:3369 with SMTP id i11-20020a170902eb4b00b0019f2d793369mr6744807pli.38.1678732912271; Mon, 13 Mar 2023 11:41:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678732912; cv=none; d=google.com; s=arc-20160816; b=QzZ4LRsRd49N01/EdJJ5SKEwO02IMkk0x+lJTZxOK+h/RyI89Snmw1dbYUR977e9w+ bWEXTbFiOuUhi+SYTXOzhyl2MRmTOedc20AxW1/b56YlYUU185KHpwgrhw1YSU4rwPu5 XK6f3fIz+iLY9dRKcYOb8PTwIEJOKvVVK7OmCcPUxGfweBNI2s4qs2jTbJeydnBPGjys JpPgRbLxNnUDon9TAT3POm63PFqwJiG+63OWPSZX46hXgUwUTSj5gE2Jj46mDvaMaXSR aaLuTdbAbhL0nr6s1TTWD7CNbznFne+2wUycrVpeMeylbkURMAqkKqN9nUiG+jZXMDJd gD8A== 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=b1IdnLFkCC4lvFIZ5nlOceiR4s4CU00g7kZ9MZ7tjHk=; b=qq7DOrRK4XvgpBDra2ahYfPVRFM1R+dDzO41W4G19sSCnTDBvBHorulTeofXPIVau1 zA/CCqD32U7pCuPz08TZoIwKe0oOwufUDxf9M2YTzqTG8AmaLtLtqdYIkCwE0OSch19S bGcjz+7mWKaJGBqiWDnHti03dL9OeRoX8b2HfMRhpS4omQ9545Z2h7+y+RM5O8hjFnFH OgpGaWGcpx0fRQLHWXsFWPoLfzEh+QVDdD5XhI5NJkW4DyM1L84dkIemhJvUVV0bcUOY B7eHZGGdf0OirXmBEcT25Iock/PGxhS4i2gkwp+sYOCHWjPOOE3LxggK+qcBelGeB3BZ 2abQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rOW7zAdt; 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 kr14-20020a170903080e00b0019ab692fc8fsi327206plb.612.2023.03.13.11.41.39; Mon, 13 Mar 2023 11:41:52 -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=rOW7zAdt; 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 S231263AbjCMSbB (ORCPT + 99 others); Mon, 13 Mar 2023 14:31:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231220AbjCMSao (ORCPT ); Mon, 13 Mar 2023 14:30:44 -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 720A98090E; Mon, 13 Mar 2023 11:30:10 -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 C3FBD61476; Mon, 13 Mar 2023 18:30:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1964C433EF; Mon, 13 Mar 2023 18:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732202; bh=iWixNYysEt/57rzWPvGF+tU4T3O5fIRqKfjVPRFzTiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rOW7zAdt3atmqn55xq4wkAhth6yviBG8RItVivIzGD3S2HYWjNpvHud9HHQrkbhsT JDVDHBPnIUb+T5ndB+erKVt1PixDzZYSOHzSDBVuBV3Q8SpButNkXzWeJwEdRz7i7a 9Avkl8tTjbaQ6lY42jQeYvqjgQwzOZpn4xrW54E4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Hans de Goede , Mark Gross , platform-driver-x86@vger.kernel.org Subject: [PATCH 04/36] platform/x86: ibm_rtl: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:46 +0100 Message-Id: <20230313182918.1312597-4-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=1912; i=gregkh@linuxfoundation.org; h=from:subject; bh=iWixNYysEt/57rzWPvGF+tU4T3O5fIRqKfjVPRFzTiE=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82aWbzuQ+71jMOT/uaVDffRvPid97S9bPWt38uzBO9 YCnv2FERywLgyATg6yYIsuXbTxH91ccUvQytD0NM4eVCWQIAxenAEykq55hwe7DE9aL6kisd5Cb dOWFixnPmQU6qgzzdFuf85+qeHxJYq2xITff3l1CW8UzAQ== 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?1760279042288762273?= X-GMAIL-MSGID: =?utf-8?q?1760279042288762273?= 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: Hans de Goede Cc: Mark Gross Cc: platform-driver-x86@vger.kernel.org Signed-off-by: Greg Kroah-Hartman 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. drivers/platform/x86/ibm_rtl.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c index 5fc665f7d9b3..2ab7d9ac542d 100644 --- a/drivers/platform/x86/ibm_rtl.c +++ b/drivers/platform/x86/ibm_rtl.c @@ -199,16 +199,26 @@ static int rtl_setup_sysfs(void) { ret = subsys_system_register(&rtl_subsys, NULL); if (!ret) { - for (i = 0; rtl_attributes[i]; i ++) - device_create_file(rtl_subsys.dev_root, rtl_attributes[i]); + struct device *dev_root = bus_get_dev_root(&rtl_subsys); + + if (dev_root) { + for (i = 0; rtl_attributes[i]; i ++) + device_create_file(dev_root, rtl_attributes[i]); + put_device(dev_root); + } } return ret; } static void rtl_teardown_sysfs(void) { + struct device *dev_root = bus_get_dev_root(&rtl_subsys); int i; - for (i = 0; rtl_attributes[i]; i ++) - device_remove_file(rtl_subsys.dev_root, rtl_attributes[i]); + + if (dev_root) { + for (i = 0; rtl_attributes[i]; i ++) + device_remove_file(dev_root, rtl_attributes[i]); + put_device(dev_root); + } bus_unregister(&rtl_subsys); }