summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/iseries/vpdinfo.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-14 15:06:10 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-14 15:06:10 +1000
commitbffa8fc3835b0d3c4a59af8aceeea3aba823b032 (patch)
tree53f46e4aef2f9b6afdaa55f82136d67b66de7dec /arch/powerpc/platforms/iseries/vpdinfo.c
parent426c1a11a677e39a8c8ed744a521d0f4cb2e417e (diff)
downloadblackbird-op-linux-bffa8fc3835b0d3c4a59af8aceeea3aba823b032.tar.gz
blackbird-op-linux-bffa8fc3835b0d3c4a59af8aceeea3aba823b032.zip
powerpc: remove ISERIES_[SUB]BUS macros
This allows us to simplify a couple of things. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc/platforms/iseries/vpdinfo.c')
-rw-r--r--arch/powerpc/platforms/iseries/vpdinfo.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/iseries/vpdinfo.c b/arch/powerpc/platforms/iseries/vpdinfo.c
index 6bd8da4f17fe..dcdac995565c 100644
--- a/arch/powerpc/platforms/iseries/vpdinfo.c
+++ b/arch/powerpc/platforms/iseries/vpdinfo.c
@@ -31,6 +31,7 @@
#include <asm/types.h>
#include <asm/resource.h>
#include <asm/abs_addr.h>
+#include <asm/pci-bridge.h>
#include <asm/iSeries/HvCallPci.h>
#include <asm/iSeries/HvTypes.h>
@@ -243,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];
@@ -255,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->DsaAddr.Dsa.busNumber;
+ subbus = pdn->DsaAddr.Dsa.subBusNumber;
agent = ISERIES_PCI_AGENTID(ISERIES_GET_DEVICE_FROM_SUBBUS(subbus),
ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus));
iSeries_Get_Location_Code(bus, agent, &frame, card);
OpenPOWER on IntegriCloud