driver-core: Add device node pointer to struct device
Subsystems (6)
PATCH 1/1 driver-core: Add device node pointer to struct device
Currently, platforms using CONFIG_OF add a 'struct device_node *of_node' to dev->archdata. However, with CONFIG_OF becoming generic for all architectures, it makes sense for commonality to move it out of archdata and into struct device proper.
This patch adds a struct device_node *of_node member to struct device and updates all locations which currently write the device_node pointer into archdata to also update dev->of_node. Subsequent patches will modify callers to use the archdata location and ultimately remove the archdata member entirely.
---
This should have been the first patch in my 37 patch series "[PATCH 00/37] OF: move device node pointer into struct device.", but I accidentally missed it. Apply this patch before the rest of the series.
I've also pushed out all the patches that I've just posted to the 'experimental-devicetree' branch of my git tree:
git://git.secretlab.ca/git/linux-2.6 experimental-devicetree
arch/microblaze/kernel/of_device.c | 3 ++- arch/powerpc/kernel/of_device.c | 3 ++- arch/powerpc/kernel/pci-common.c | 5 +++-- arch/powerpc/kernel/vio.c | 3 ++- arch/powerpc/platforms/ps3/system-bus.c | 3 ++- arch/sparc/kernel/pci.c | 3 ++- drivers/of/of_mdio.c | 3 ++- drivers/of/of_spi.c | 3 ++- include/linux/device.h | 4 ++++ 9 files changed, 21 insertions(+), 9 deletions(-)
arch/microblaze/kernel/of_device.c +2 -1
@@ -53,7 +53,8 @@ struct of_device *of_device_alloc(struct device_node *np, dev->dev.dma_mask = &dev->dma_mask; dev->dev.parent = parent; dev->dev.release = of_release_dev; - dev->dev.archdata.of_node = np; + dev->dev.archdata.of_node = np;/* temporary; remove after merging */ + dev->dev.of_node = np;if (bus_id)dev_set_name (&dev->dev, bus_id);
arch/powerpc/kernel/of_device.c +2 -1
@@ -73,7 +73,8 @@ struct of_device *of_device_alloc(struct device_node *np, dev->dev.dma_mask = &dev->dma_mask; dev->dev.parent = parent; dev->dev.release = of_release_dev; - dev->dev.archdata.of_node = np; + dev->dev.archdata.of_node = np;/* temporary; remove after merging */ + dev->dev.of_node = np;if (bus_id)dev_set_name (&dev->dev,"%s" , bus_id);
arch/powerpc/kernel/pci-common.c +3 -2
@@ -1111,8 +1111,9 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus)if (dev->is_added)continue ; -/* Setup OF node pointer in archdata */ - sd->of_node =pci_device_to_OF_node (dev); +/* Setup OF node pointer in the device */ + sd->of_node =pci_device_to_OF_node (dev);/* temporary */ + dev->dev.of_node =pci_device_to_OF_node (dev);/* Fixup NUMA node as it may not be setup yet by the generic * code and is needed by the DMA init
arch/powerpc/kernel/vio.c +2 -1
@@ -1229,7 +1229,8 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)if (unit_address !=NULL ) viodev->unit_address = *unit_address; } - viodev->dev.archdata.of_node =of_node_get (of_node); + viodev->dev.of_node =of_node_get (of_node); + viodev->dev.archdata.of_node = viodev->dev.of_node;/* temporary */ if (firmware_has_feature (FW_FEATURE_CMO ))vio_cmo_set_dma_ops (viodev);
arch/powerpc/platforms/ps3/system-bus.c +2 -1
@@ -765,7 +765,8 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)BUG (); }; - dev->core.archdata.of_node =NULL ; + dev->core.of_node =NULL ; + dev->core.archdata.of_node =NULL ;/* temporary */ set_dev_node (&dev->core,0 );pr_debug ("%s:%d add %s\n" , __func__, __LINE__,dev_name (&dev->core));
arch/sparc/kernel/pci.c +2 -1
@@ -261,7 +261,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, sd->iommu = pbm->iommu; sd->stc = &pbm->stc; sd->host_controller = pbm; - sd->prom_node = node; + sd->prom_node = node;/* temporary */ sd->op = op =of_find_device_by_node (node); sd->numa_node = pbm->numa_node;
@@ -285,6 +285,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, dev->sysdata = node; dev->dev.parent = bus->bridge; dev->dev.bus = &pci_bus_type; + dev->dev.of_node = node; dev->devfn = devfn; dev->multifunction =0 ;/* maybe a lie? */ set_pcie_port_type (dev);
drivers/of/of_mdio.c +2 -1
@@ -79,7 +79,8 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)/* Associate the OF node with the device structure so it * can be looked up later */ of_node_get (child); -dev_archdata_set_node (&phy->dev.archdata, child); +dev_archdata_set_node (&phy->dev.archdata, child);/* temp */ + phy->dev.of_node = child;/* All data is now stored in the phy struct; register it */ rc =phy_device_register (phy);
drivers/of/of_spi.c +2 -1
@@ -79,7 +79,8 @@ void of_register_spi_devices(struct spi_master *master, struct device_node *np)/* Store a pointer to the node in the device structure */ of_node_get (nc); - spi->dev.archdata.of_node = nc; + spi->dev.of_node = nc; + spi->dev.archdata.of_node = nc;/* temporary */ /* Register the new device */ request_module (spi->modalias);
include/linux/device.h +4 -0
@@ -34,6 +34,7 @@ struct class;struct class_private ;struct bus_type ;struct bus_type_private ; +struct device_node ;struct bus_attribute {struct attribute attr;
@@ -433,6 +434,9 @@ struct device {override */ /* arch specific additions */ struct dev_archdata archdata; +#ifdef CONFIG_OF +struct device_node *of_node; +#endif dev_t devt;/* dev_t, creates the sysfs "dev" */