Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26F47C6FD19 for ; Mon, 13 Mar 2023 18:30:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229537AbjCMSai (ORCPT ); Mon, 13 Mar 2023 14:30:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230466AbjCMSaV (ORCPT ); Mon, 13 Mar 2023 14:30:21 -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 15F6A521E4; Mon, 13 Mar 2023 11:29:56 -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 1637B6147B; Mon, 13 Mar 2023 18:29:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 260A8C433D2; Mon, 13 Mar 2023 18:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732191; bh=aOxVBk6SUq0AKI+kzrDhXc/isUQsekLwZxFcNjw8eTg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D/DBZb1+wUdopjALL+oD6cOmayUJHOkCNX2dDoflulo8Ii2EhupwE9KxN9XTUAQ7E VERjBKBU34vsEmveqqsY4sOVHu8V8OJhnggiBf0YTbQIYXw6l/GlDn1tDqeSx0NtWM UdEf5z35pYIU2FcUzqkSj8wbq1gnp1L3/WjKRkXE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Ilya Leoshkevich , linux-s390@vger.kernel.org Subject: [PATCH 19/36] s390/smp: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:29:01 +0100 Message-Id: <20230313182918.1312597-19-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=1672; i=gregkh@linuxfoundation.org; h=from:subject; bh=aOxVBk6SUq0AKI+kzrDhXc/isUQsekLwZxFcNjw8eTg=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82ZVst5NlJ+pYXlJZE1H9boH7gh09y/qXyVh+sE8w+ xn96/OZjlgWBkEmBlkxRZYv23iO7q84pOhlaHsaZg4rE8gQBi5OAZiIZxzDgjkP5lspMOzkYa/8 Fel299iOdW9O/GdYcPrdLL0n1Y7rftybJPDsZkcWz+orhQA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: Christian Borntraeger Cc: Sven Schnelle Cc: Ilya Leoshkevich Cc: linux-s390@vger.kernel.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/s390/kernel/smp.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index d4888453bbf8..4df797ab8ca2 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -1227,11 +1227,17 @@ static DEVICE_ATTR_WO(rescan); static int __init s390_smp_init(void) { + struct device *dev_root; int cpu, rc = 0; - rc = device_create_file(cpu_subsys.dev_root, &dev_attr_rescan); - if (rc) - return rc; + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + rc = device_create_file(dev_root, &dev_attr_rescan); + put_device(dev_root); + if (rc) + return rc; + } + for_each_present_cpu(cpu) { rc = smp_add_present_cpu(cpu); if (rc) -- 2.39.2