From patchwork Mon Mar 13 18:28:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 69037 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1347902wrd; Mon, 13 Mar 2023 11:49:09 -0700 (PDT) X-Google-Smtp-Source: AK7set+TCn5uWbTcVVfinYhFHaOFvXNMKXdqc878sH/0piv3SKxJMGsWN0oneEivrcoLVEsC+YYE X-Received: by 2002:a17:903:247:b0:19e:8076:9bd2 with SMTP id j7-20020a170903024700b0019e80769bd2mr40880918plh.17.1678733349198; Mon, 13 Mar 2023 11:49:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678733349; cv=none; d=google.com; s=arc-20160816; b=ZAS7qOPUEdE8XeYjpjBZjMYvX4PZz3j+nglaZj/Gy0KrrQAGljri90H/b4xL4+Tpic G2e1pS9EwsqET3eqFUWNgrhT7Dmn0DFDAaAO3Qf0lwUJqnWuSVFQxOvYvUzsVUhiBstQ alDXFnPFM88wNMKYwvtQm4KNC5QqV3uGq3xJkCckVjMEKqqVrjG5Ho3lf7QEGKPRCzj7 0GFM62ZUN6xgPpELUbZ8HSt0ZoC90ubzrTLrXx58PKSSJ86FL0Ce3f1myzeCrpUDx1tM fbjQd5UoStIgkBhCdAItvTrYoLNoAA5XteZS56gFBelFSJeF7eOsRZiazbEuU9TQ+GIw c6Xg== 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=OBd5Dh5Ia3u0As9x0dT71ysqviyPXVBJCqIVtEzKXRs=; b=0opwBkYPYjg03ypSvzpjOZ3IYJuD8Fnpp7xQLDAkGAp2VvhKGrSrDeF4MdpS9ujW/X LDcX6SXg16BbaLYrdoNiyKuwLx6LrMUVkpX2zqjZ/ByFIVbzyW8VC70dL4CHAPKMdR1/ yj3d5Xgesn+r3MQe4KqIzH4Hn92gCKCtg96ni9QyScC/tjn+cCjM7AJLKHdMGVMbgoWG Bgb+VFuPjIzo4H+tf+AF0Ecm1KSAwLtcfpjQWacyefFC8gI4t/q6R1lbZYwyVrfB8xR+ qr5mvIwVniPbpfDoLKWO/u779ql0/0x6+540WHZm93L6hb7eNiXgL1Tw4pWMd9mqFoUJ VXcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NOUprOLh; 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 li11-20020a170903294b00b0019f3bf39426si353501plb.518.2023.03.13.11.48.56; Mon, 13 Mar 2023 11:49:09 -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=NOUprOLh; 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 S231178AbjCMScI (ORCPT + 99 others); Mon, 13 Mar 2023 14:32:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbjCMSbb (ORCPT ); Mon, 13 Mar 2023 14:31:31 -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 E2A2582A94; Mon, 13 Mar 2023 11:30:53 -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 9CCABB811E3; Mon, 13 Mar 2023 18:29:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB9ABC433D2; Mon, 13 Mar 2023 18:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678732186; bh=BQ3qJWQ4zg4slNAg8mMque6OMF2Djl4oQD+H69jP9YY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NOUprOLhlkrlwRZlYiu/wusk/ux2b99AOfviPnKSf76GQ+8jEd73QVbTrjw/hspgt 4/VnagP02qN2iTAexDyC3Dfip+bob26aEJ47a2TyvbqJcwJu3DvHpnI3IHsN+7L7T0 nYFQqJV33hPBlZE6QD0wkfj2buWCA9/P06lYmIkA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH 17/36] sh: intc: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:59 +0100 Message-Id: <20230313182918.1312597-17-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=1515; i=gregkh@linuxfoundation.org; h=from:subject; bh=BQ3qJWQ4zg4slNAg8mMque6OMF2Djl4oQD+H69jP9YY=; b=owGbwMvMwCRo6H6F97bub03G02pJDCn82RWiLd1ftjeein5+RdZTqZ4vXOT8mUW3BDf4n/fa5 vauY09iRywLgyATg6yYIsuXbTxH91ccUvQytD0NM4eVCWQIAxenAEzkjDrDgrmXDFfe01psfmur 8OJyrscbWTMyLRgWNN8X4bb9MP25+R2T4CKV2SyczH5XAA== 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?1760279500478885787?= X-GMAIL-MSGID: =?utf-8?q?1760279500478885787?= 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: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Acked-by: John Paul Adrian Glaubitz --- 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/sh/intc/userimask.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/sh/intc/userimask.c b/drivers/sh/intc/userimask.c index f9f043a3d90a..abe9091827cd 100644 --- a/drivers/sh/intc/userimask.c +++ b/drivers/sh/intc/userimask.c @@ -61,10 +61,18 @@ static DEVICE_ATTR(userimask, S_IRUSR | S_IWUSR, static int __init userimask_sysdev_init(void) { + struct device *dev_root; + int ret = 0; + if (unlikely(!uimask)) return -ENXIO; - return device_create_file(intc_subsys.dev_root, &dev_attr_userimask); + dev_root = bus_get_dev_root(&intc_subsys); + if (dev_root) { + ret = device_create_file(dev_root, &dev_attr_userimask); + put_device(dev_root); + } + return ret; } late_initcall(userimask_sysdev_init);