aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/pci.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-04-13 19:12:56 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-05-18 18:10:45 -0400
commit58f9b0b02414062eaff46716bc04b47d7e79add5 (patch)
treefa5265f4c37c2f4afb42a126f39cccc9602e06a2 /arch/sparc/kernel/pci.c
parent61c7a080a5a061c976988fd4b844dfb468dda255 (diff)
of: eliminate of_device->node and dev_archdata->{of,prom}_node
This patch eliminates the node pointer from struct of_device and the of_node (or prom_node) pointer from struct dev_archdata since the node pointer is now part of struct device proper when CONFIG_OF is set, and all users of the old pointer locations have already been converted over to use device->of_node. Also remove dev_archdata_{get,set}_node() as it is no longer used by anything. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/sparc/kernel/pci.c')
-rw-r--r--arch/sparc/kernel/pci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index c7a214ec5aff..8a8363adb8bd 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -261,8 +261,6 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
261 sd->iommu = pbm->iommu; 261 sd->iommu = pbm->iommu;
262 sd->stc = &pbm->stc; 262 sd->stc = &pbm->stc;
263 sd->host_controller = pbm; 263 sd->host_controller = pbm;
264 sd->prom_node = node;
265 dev->dev.of_node = node;
266 sd->op = op = of_find_device_by_node(node); 264 sd->op = op = of_find_device_by_node(node);
267 sd->numa_node = pbm->numa_node; 265 sd->numa_node = pbm->numa_node;
268 266
@@ -286,6 +284,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
286 dev->sysdata = node; 284 dev->sysdata = node;
287 dev->dev.parent = bus->bridge; 285 dev->dev.parent = bus->bridge;
288 dev->dev.bus = &pci_bus_type; 286 dev->dev.bus = &pci_bus_type;
287 dev->dev.of_node = node;
289 dev->devfn = devfn; 288 dev->devfn = devfn;
290 dev->multifunction = 0; /* maybe a lie? */ 289 dev->multifunction = 0; /* maybe a lie? */
291 set_pcie_port_type(dev); 290 set_pcie_port_type(dev);