vserver 1.9.5.x5

[linux-2.6.git] / arch / ppc64 / kernel / iSeries_VpdInfo.c

diff --git a/arch/ppc64/kernel/iSeries_VpdInfo.c b/arch/ppc64/kernel/iSeries_VpdInfo.c
index b6d4b93..a6f0ff2 100644 (file)
--- a/arch/ppc64/kernel/iSeries_VpdInfo.c
+++ b/arch/ppc64/kernel/iSeries_VpdInfo.c
@@ -36,7 +36,6 @@
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iSeries/mf.h>
 #include <asm/iSeries/LparData.h>
-//#include <asm/iSeries/iSeries_VpdInfo.h>
 #include <asm/iSeries/iSeries_pci.h>
 #include "pci.h"
 
@@ -84,30 +83,6 @@ struct SlotMapStruct {
 typedef struct SlotMapStruct SlotMap;
 #define SLOT_ENTRY_SIZE   16
 
-/*
- * Bus, Card, Board, FrameId, CardLocation.
- */
-LocationData* iSeries_GetLocationData(struct pci_dev *PciDev)
-{
-       struct iSeries_Device_Node *DevNode =
-               (struct iSeries_Device_Node *)PciDev->sysdata;
-       LocationData *LocationPtr =
-               (LocationData *)kmalloc(LOCATION_DATA_SIZE, GFP_KERNEL);
-
-       if (LocationPtr == NULL) {
-               printk("PCI: LocationData area allocation failed!\n");
-               return NULL;
-       }
-       memset(LocationPtr, 0, LOCATION_DATA_SIZE);
-       LocationPtr->Bus = ISERIES_BUS(DevNode);
-       LocationPtr->Board = DevNode->Board;
-       LocationPtr->FrameId = DevNode->FrameId;
-       LocationPtr->Card = PCI_SLOT(DevNode->DevFn);
-       strcpy(&LocationPtr->CardLocation[0], &DevNode->CardLocation[0]);
-       return LocationPtr;
-}
-EXPORT_SYMBOL(iSeries_GetLocationData);
-
 /*
  * Formats the device information.
  * - Pass in pci_dev* pointer to the device.
@@ -148,18 +123,6 @@ int iSeries_Device_Information(struct pci_dev *PciDev, char *buffer,
        return len;
 }
 
-/*
- * Build a character string of the device location, Frame  1, Card  C10
- */
-int device_Location(struct pci_dev *PciDev, char *BufPtr)
-{
-       struct iSeries_Device_Node *DevNode =
-               (struct iSeries_Device_Node *)PciDev->sysdata;
-       return sprintf(BufPtr, "PCI: Bus%3d, AgentId%3d, Vendor %04X, Location %s",
-                      DevNode->DsaAddr.Dsa.busNumber, DevNode->AgentId,
-                      DevNode->Vendor, DevNode->Location);
-}
-
 /*
  * Parse the Slot Area
  */