[POWERPC] iSeries: Remove pci_dn dependency from iSeries_Device_Information

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 8844d3e..3cf51c6 100644 (file)
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -218,7 +218,8 @@ void __init iSeries_pci_final_fixup(void)
                pdev->sysdata = node;
                PCI_DN(node)->pcidev = pdev;
                allocate_device_bars(pdev);
-               iSeries_Device_Information(pdev, num_dev);
+               iSeries_Device_Information(pdev, num_dev, pdn->busno,
+                               pdn->bussubno);
                iommu_devnode_init_iSeries(pdev, node);
        }
        iSeries_activate_IRQs();

diff --git a/arch/powerpc/platforms/iseries/pci.h b/arch/powerpc/platforms/iseries/pci.h
index 730986b..3cb18fa 100644 (file)
--- a/arch/powerpc/platforms/iseries/pci.h
+++ b/arch/powerpc/platforms/iseries/pci.h
@@ -58,7 +58,8 @@ static inline u64 iseries_ds_addr(struct device_node *node)
                        + ((u64)0x10 << 32);
 }
 
-extern void    iSeries_Device_Information(struct pci_dev*, int);
+extern void    iSeries_Device_Information(struct pci_dev *PciDev, int count,
+                       u16 bus, HvSubBusNumber subbus);
 #ifdef CONFIG_PCI
 extern void    iSeries_pci_final_fixup(void);
 #else

diff --cc arch/powerpc/platforms/iseries/vpdinfo.c
Simple merge