merge filename and modify references to iseries/it_exp_vpd_panel.h

[karo-tx-linux.git] / arch / powerpc / platforms / iseries / vpdinfo.c

diff --git a/arch/powerpc/platforms/iseries/vpdinfo.c b/arch/powerpc/platforms/iseries/vpdinfo.c
index d8a6796924e26c6f79ebbe9b0e4d9d6e5afa0c1b..23a6d1e5b4293236fd414d046bae8ecb9c843681 100644 (file)
--- a/arch/powerpc/platforms/iseries/vpdinfo.c
+++ b/arch/powerpc/platforms/iseries/vpdinfo.c
@@ -27,12 +27,15 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+
 #include <asm/types.h>
 #include <asm/resource.h>
+#include <asm/abs_addr.h>
+#include <asm/pci-bridge.h>
+#include <asm/iseries/hv_types.h>
 
-#include <asm/iSeries/HvCallPci.h>
-#include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/iSeries_pci.h>
+#include "pci.h"
+#include "call_pci.h"
 
 /*
  * Size of Bus VPD data
@@ -212,7 +215,7 @@ static void __init iSeries_Get_Location_Code(u16 bus, HvAgentId agent,
                printk("PCI: Bus VPD Buffer allocation failure.\n");
                return;
        }
-       BusVpdLen = HvCallPci_getBusVpd(bus, ISERIES_HV_ADDR(BusVpdPtr),
+       BusVpdLen = HvCallPci_getBusVpd(bus, iseries_hv_addr(BusVpdPtr),
                                        BUS_VPDSIZE);
        if (BusVpdLen == 0) {
                printk("PCI: Bus VPD Buffer zero length.\n");
@@ -241,6 +244,7 @@ out_free:
 void __init iSeries_Device_Information(struct pci_dev *PciDev, int count)
 {
        struct device_node *DevNode = PciDev->sysdata;
+       struct pci_dn *pdn;
        u16 bus;
        u8 frame;
        char card[4];
@@ -253,8 +257,9 @@ void __init iSeries_Device_Information(struct pci_dev *PciDev, int count)
                return;
        }
 
-       bus = ISERIES_BUS(DevNode);
-       subbus = ISERIES_SUBBUS(DevNode);
+       pdn = PCI_DN(DevNode);
+       bus = pdn->busno;
+       subbus = pdn->bussubno;
        agent = ISERIES_PCI_AGENTID(ISERIES_GET_DEVICE_FROM_SUBBUS(subbus),
                        ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus));
        iSeries_Get_Location_Code(bus, agent, &frame, card);