[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, 7 deletions

diff --git a/include/asm-ppc64/iSeries/iSeries_pci.h b/include/asm-ppc64/iSeries/iSeries_pci.h
index ee0212f18b99..575f611f8b33 100644
--- a/include/asm-ppc64/iSeries/iSeries_pci.h
+++ b/include/asm-ppc64/iSeries/iSeries_pci.h
@@ -76,19 +76,13 @@ struct iSeries_Device_Node {
         union HvDsaMap  DsaAddr;        /* Direct Select Address */
                                         /* busNumber, subBusNumber, */
                                         /* deviceId, barNumber */
-        HvAgentId       AgentId;        /* Hypervisor DevFn */
         int             DevFn;          /* Linux devfn */
         int             Irq;            /* Assigned IRQ */
         int             Flags;          /* Possible flags(disable/bist)*/
         u8              LogicalSlot;    /* Hv Slot Index for Tces */
         struct iommu_table *iommu_table;/* Device TCE Table */
-        u8              PhbId;          /* Phb Card is on. */
-        u8              FrameId;        /* iSeries spcn Frame Id */
-        char            CardLocation[4];/* Char format of planar vpd */
-        char            Location[20];   /* Frame        1, Card C10 */
 };
 
-extern int      iSeries_Device_Information(struct pci_dev*, char*, int);
-extern void     iSeries_Get_Location_Code(struct iSeries_Device_Node*);
+extern void     iSeries_Device_Information(struct pci_dev*, int);
 
 #endif /* _ISERIES_64_PCI_H */