PCI: of: Propagate firmware node by calling device_set_node()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 21 Apr 2023 10:09:39 +0000 (13:09 +0300)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 6 Jun 2023 22:15:45 +0000 (17:15 -0500)
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.

Link: https://lore.kernel.org/r/20230421100939.68225-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/of.c

index 2c25f4f..e51219f 100644 (file)
@@ -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)