From patchwork Fri Apr 21 09:29:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 86200 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp940390vqo; Fri, 21 Apr 2023 02:41:28 -0700 (PDT) X-Google-Smtp-Source: AKy350aKpD/IXFIkXgVLprdOnt1VyLADT9hEq/8jjRP1EsAQPByq7VvfJ8ih6zyK7Trky47zJg5k X-Received: by 2002:a05:6a21:3988:b0:ef:f558:b7d with SMTP id ad8-20020a056a21398800b000eff5580b7dmr1815824pzc.59.1682070088279; Fri, 21 Apr 2023 02:41:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682070088; cv=none; d=google.com; s=arc-20160816; b=RDyII3uoX/pTn7rrQJ3zO3bA4wTh/WC67ThSqjYTjUV5yv0ip7MOlAc/dTGopJr8CH GlhiZwB3xuM5MWyMiMtIgxU+rISZSq6/tCty8EINNsT9MVuOreVn1I5xD77z9HwRSeL7 2Tf53vFwwbKWEFU3u2ID9p16956MiNSEPK+ZQ3Ed67oSfOITYOZBBSYaG0u9UP4TdE/O 9y5W2uDQRlV+wBHfmP83wxIuvel4p1xaQoCiFLOBxxlpBoV/PY6VgFNmhJdfucs9+Etp +gQLnnLTRVEe6hyLTOO51lJN6kZydQtfL3NDpY1J+x6cCBSjxJfwyuZU2vLwZlMGAWMS +4AA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Qu6oJFYJJZN61bSWN9BUfqyxLrq+HTTGIQdbcmNQVvA=; b=0N3uaRZ7myRR2FqbsPuIppp+6SM7yD5E50NnMxZ2LhLzK7+glbuslUvkQ7gz7hx9Nw qUWqSxaMdM52IzyO1AqL5DnI5NazU4FxXEYkD9DnrEQTN+oyBxlyPSaKGeYlFxr/yr1C AWjxsuW8+kiSgtaWWvEBTiaKuOKOpgslNdpLQNKM6SygiHvmrq9m1MtAfrWmkolDrWWn FPaGhjUtL0ul8jBhVrA+lDuiXYfwZFN/PRXRCdlHe7eJUs+tdzUQ93pp/e3xlUfNfqXk 70tz+XLik+p46Q8eZ7OqYUwcEBjopTYsi1Gk5SdwSpUDw+C6OqNbStGX6LiD4sawyuca Jl4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iPpUjYTm; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r20-20020a6560d4000000b0050bdfdf4a66si3737837pgv.147.2023.04.21.02.41.15; Fri, 21 Apr 2023 02:41:28 -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=@intel.com header.s=Intel header.b=iPpUjYTm; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231859AbjDUJ3t (ORCPT + 99 others); Fri, 21 Apr 2023 05:29:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbjDUJ3q (ORCPT ); Fri, 21 Apr 2023 05:29:46 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0669213D; Fri, 21 Apr 2023 02:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682069384; x=1713605384; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=zp2e5dMArkvPTnl7T3iiTEMKwSfJ7vHlEh8MtJDUXIE=; b=iPpUjYTmmI2XATz7gO5jetgpcEdIXJWFrNwwg/Uc9IwFj+VryYjtVQls fePhUTm+VnuYiaBAZZtbcAwLRRb0ji3ATJUGWkVhoowVFKNkbdynRmmVk i+pGp4iFyTUJCmQnuCybm4OsNsnW9P0qVXKnOrMyuqbqQ9raiGY8OX5LW eYysslAu36jtjAZlsNAQrnk8D8Ewo2d4gcK1kRcB3d+O6irupWYleftij NRO38mK4zB8Rsjj3cR/4AQ8ESYu3ILoHG49qUL2uIswwe9wutrmz8iRKS KPCzGGVtdmNYGIL6HbBKjUTiuWzlCevwHWCXQ3iFsQmLF7F5PT3jl5jXh A==; X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="343442494" X-IronPort-AV: E=Sophos;i="5.99,214,1677571200"; d="scan'208";a="343442494" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2023 02:29:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="938419536" X-IronPort-AV: E=Sophos;i="5.99,214,1677571200"; d="scan'208";a="938419536" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 21 Apr 2023 02:29:42 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 294F5C06; Fri, 21 Apr 2023 12:29:47 +0300 (EEST) From: Andy Shevchenko To: Rob Herring , =?utf-8?q?Pali_Roh=C3=A1r?= , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Bjorn Helgaas , Andy Shevchenko Subject: [PATCH v2 1/1] PCI: of: Propagate firmware node by calling device_set_node() Date: Fri, 21 Apr 2023 12:29:45 +0300 Message-Id: <20230421092945.66176-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1763778324819729351?= X-GMAIL-MSGID: =?utf-8?q?1763778324819729351?= Insulate pci_set_of_node() and pci_set_bus_of_node() from possible changes to fwnode_handle implementation by using device_set_node() instead of open-coding dev->dev.fwnode assignments. Signed-off-by: Andy Shevchenko --- v2: rewritten commit message as suggested (Bjorn), rebased on the latest code drivers/pci/of.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 4c2ef2e28fb5..2679d6e6da30 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -39,16 +39,14 @@ int pci_set_of_node(struct pci_dev *dev) return -ENODEV; } - dev->dev.of_node = node; - dev->dev.fwnode = &node->fwnode; + device_set_node(&dev->dev, node); return 0; } void pci_release_of_node(struct pci_dev *dev) { of_node_put(dev->dev.of_node); - dev->dev.of_node = NULL; - dev->dev.fwnode = NULL; + device_set_node(&dev->dev, NULL); } void pci_set_bus_of_node(struct pci_bus *bus) @@ -63,17 +61,13 @@ void pci_set_bus_of_node(struct pci_bus *bus) bus->self->external_facing = true; } - bus->dev.of_node = node; - - if (bus->dev.of_node) - bus->dev.fwnode = &bus->dev.of_node->fwnode; + device_set_node(&bus->dev, of_fwnode_handle(node)); } void pci_release_bus_of_node(struct pci_bus *bus) { of_node_put(bus->dev.of_node); - bus->dev.of_node = NULL; - bus->dev.fwnode = NULL; + device_set_node(&bus->dev, NULL); } struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus)