From patchwork Fri Apr 21 10:09:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 86226 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp959745vqo; Fri, 21 Apr 2023 03:19:26 -0700 (PDT) X-Google-Smtp-Source: AKy350Y3IhJEbL+Zk5f4ZBhzHguxKFR3iJHfxRVLZ78gfnhBSKBG2R5N7/0DQIJpAoHID2RhxQy1 X-Received: by 2002:a05:6a21:3982:b0:f1:2096:405a with SMTP id ad2-20020a056a21398200b000f12096405amr5880514pzc.28.1682072366492; Fri, 21 Apr 2023 03:19:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682072366; cv=none; d=google.com; s=arc-20160816; b=jG9HmEWzFbgx61JAZHYbREXGcTPdKHBDDcNnDx3iYY0FfEFN5ISxGIbkHw2GIY5jiA f5WOjXUGG8D5pe7v9Xqs36rPZjstfhNjhetJxpzPrWhxRR3hhGbkq1+6E8Be3MilcpRb f0DmeOHqSgOMOesWY4vn1GlZauhbRAiAxkthfpeh6sIZ55y889WZjBzntdQzKrX48KvH NMXhNd82t99YEUVmjAw5SuI242V6u5KivrniHy2aiANRtGxxc0r7oSiDF7yE0jg6Gxq9 jcb/6kNPDR9D61+v4itoUc91ji+MDvizDS3d8HeC+DbFwWW9PwCDkFqk5nHIycl8uVZ9 l61g== 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=YAmjLMpyd9Bjz4yqTPbn4npCWzLc2Ge8wTeS4382IeU=; b=dPB+w57Mcs4sAKw0CrbfvblHdxTssYcZB/JIJpWBUUA7mUbAnSMgH6m7b5h7p5iKJv VpGdtLfGnu8nEZ6R+kRDZWH14y4h39KmeVKaFzV84zhJg+UJSPrWjJFd1/CP8wpZBoE+ yVgoDcF8zsDkwOCfWKLE/gU4Wn4tQQxfFVMFh4mbgNUjeqzq+6HARNyPa3SSAxgptEAN nt+siMwDMBjC0ZbOYEb+VHd2hcAm06X/Tt9PEhDKWmMgIT7jWr1zSbeLGEqU4FWQWP/m paFlvrKkXL1RhiSG8v14QGGvbl4/QML10vQ+T79yVXLruCKWV8iCUhfVTCzZGdE3vna6 F8cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MrxTDsH3; 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 j69-20020a638048000000b0051f09c62b5fsi3857271pgd.327.2023.04.21.03.19.11; Fri, 21 Apr 2023 03:19:26 -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=MrxTDsH3; 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 S231946AbjDUKKB (ORCPT + 99 others); Fri, 21 Apr 2023 06:10:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231869AbjDUKJn (ORCPT ); Fri, 21 Apr 2023 06:09:43 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 680B0C145; Fri, 21 Apr 2023 03:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682071778; x=1713607778; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=GLPpA5lDZ0mZwbKjbwTkAID/m0yPy1TX9T+nWpkCkQI=; b=MrxTDsH3ESd2/6xOpMYn/2qmdMY7TDKbjsOUk1E0FmYSuc1+a91trNcj IDLYRL6n9jBHZKRxvGrtTPf7pIq/hO3881+VG9yLqTYjIuPQNSLeZf4X9 ubIoZOJ1StJD8BCGtU3k3qgVQhED9k4mwSDdTlVrEEi31X/sjQMkzqFR4 hevkboWRyUFvSMa/Z/GSemrwbdtdLDTyyedYtRMHKFbHanbd3bECJz0d5 W87gsNVxJKUSRfJLylE3c2WJYAq3dwgQc+oph8gioHRnIhNR9Ow7ReOlY pqVj0zHrSqSBy46PxJ15TLZhtJYaK5hd4jMzJfWUg7E8qLsmxv6EPLQDH g==; X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="411228614" X-IronPort-AV: E=Sophos;i="5.99,214,1677571200"; d="scan'208";a="411228614" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2023 03:09:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="816371086" X-IronPort-AV: E=Sophos;i="5.99,214,1677571200"; d="scan'208";a="816371086" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 21 Apr 2023 03:09:35 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 192B3C06; Fri, 21 Apr 2023 13:09:40 +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 v3 1/1] PCI: of: Propagate firmware node by calling device_set_node() Date: Fri, 21 Apr 2023 13:09:39 +0300 Message-Id: <20230421100939.68225-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, RCVD_IN_MSPIKE_H2,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?1763780713836936084?= 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 --- v3: fixed compilation issue 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..82bff748cd4d 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, of_fwnode_handle(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)