[PATCH] ppc64 iSeries: remove some more members of iSeries_Device_Node

The AgentId, PhbId, FrameId, CardLocation and Location members of
iSeries_Device_Node are stored early in the boot process just so that a
message about the device can be printed later in the boot process.  Remove
them and construct the message by doing the VPD parsing at the time the
message is printed.

Also remove a few unused defines in iSeries_VpdInfo.c.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 6 deletions

diff --git a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c
index 0a28b6ca65d0..356e4fd9a94f 100644
--- a/arch/ppc64/kernel/iSeries_pci.c
+++ b/arch/ppc64/kernel/iSeries_pci.c
@@ -223,9 +223,7 @@ static struct iSeries_Device_Node *build_device_node(HvBusNumber Bus,
         node->DsaAddr.Dsa.busNumber = Bus;
         node->DsaAddr.Dsa.subBusNumber = SubBus;
         node->DsaAddr.Dsa.deviceId = 0x10;
-        node->AgentId = AgentId;
         node->DevFn = PCI_DEVFN(ISERIES_ENCODE_DEVICE(AgentId), Function);
-        iSeries_Get_Location_Code(node);
         return node;
 }
 
@@ -299,7 +297,6 @@ void __init iSeries_pci_final_fixup(void)
 {
         struct pci_dev *pdev = NULL;
         struct iSeries_Device_Node *node;
-        char Buffer[256];
         int DeviceCount = 0;
 
         PPCDBG(PPCDBG_BUSWALK, "iSeries_pcibios_fixup Entry.\n"); 
@@ -321,9 +318,7 @@ void __init iSeries_pci_final_fixup(void)
                                         "pdev 0x%p <==> DevNode 0x%p\n",
                                         pdev, node);
                         allocate_device_bars(pdev);
-                        iSeries_Device_Information(pdev, Buffer,
-                                        sizeof(Buffer));
-                        printk("%d. %s\n", DeviceCount, Buffer);
+                        iSeries_Device_Information(pdev, DeviceCount);
                         iommu_devnode_init_iSeries(node);
                 } else
                         printk("PCI: Device Tree not found for 0x%016lX\n",