From f2bffd32df059d24fb85c112a20d87d11fe98a76 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 19 May 2006 16:51:57 +1000
Subject: [PATCH] --- yaml --- r: 28719 b: refs/heads/master c:
 403fac4f83bd8e089a192c542511fbeb2729a6c5 h: refs/heads/master i:   28717:
 26c044c98cc479c9f8f795595db9a3f0b009a185   28715:
 e065ef1fb46743f759a426576f06d379d1517fec   28711:
 1fe6bccdef775209317d258e024bec12066ac54d   28703:
 d1b3c34093c2d6abc695f42690ba0d019b6f47f2 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/platforms/iseries/iommu.c | 5 ++++-
 trunk/arch/powerpc/platforms/iseries/pci.c   | 8 --------
 trunk/include/asm-powerpc/pci-bridge.h       | 4 ----
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index f658de123802..4ad1c751bbe0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b02527931672749d404b5f640b7e086afc37f4e0
+refs/heads/master: 403fac4f83bd8e089a192c542511fbeb2729a6c5
diff --git a/trunk/arch/powerpc/platforms/iseries/iommu.c b/trunk/arch/powerpc/platforms/iseries/iommu.c
index 75a5a1e8abb8..a992f6af249f 100644
--- a/trunk/arch/powerpc/platforms/iseries/iommu.c
+++ b/trunk/arch/powerpc/platforms/iseries/iommu.c
@@ -162,10 +162,13 @@ void iommu_devnode_init_iSeries(struct device_node *dn)
 {
 	struct iommu_table *tbl;
 	struct pci_dn *pdn = PCI_DN(dn);
+	u32 *lsn = (u32 *)get_property(dn, "linux,logical-slot-number", NULL);
+
+	BUG_ON(lsn == NULL);
 
 	tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);
 
-	iommu_table_getparms_iSeries(pdn->busno, pdn->LogicalSlot, 0, tbl);
+	iommu_table_getparms_iSeries(pdn->busno, *lsn, 0, tbl);
 
 	/* Look for existing tce table */
 	pdn->iommu_table = iommu_table_find(tbl);
diff --git a/trunk/arch/powerpc/platforms/iseries/pci.c b/trunk/arch/powerpc/platforms/iseries/pci.c
index edaafbb817b7..86a869839d34 100644
--- a/trunk/arch/powerpc/platforms/iseries/pci.c
+++ b/trunk/arch/powerpc/platforms/iseries/pci.c
@@ -191,7 +191,6 @@ void iSeries_pcibios_init(void)
 		for (dn = NULL; (dn = of_get_next_child(node, dn)) != NULL;) {
 			struct pci_dn *pdn;
 			u32 *reg;
-			u32 *lsn;
 
 			reg = (u32 *)get_property(dn, "reg", NULL);
 			if (reg == NULL) {
@@ -203,12 +202,6 @@ void iSeries_pcibios_init(void)
 				printk(KERN_DEBUG "no subbus property!\n");
 				continue;
 			}
-			lsn = (u32 *)get_property(dn,
-					"linux,logical-slot-number", NULL);
-			if (lsn == NULL) {
-				printk(KERN_DEBUG "no logical-slot-number\n");
-				continue;
-			}
 
 			pdn = kzalloc(sizeof(*pdn), GFP_KERNEL);
 			if (pdn == NULL)
@@ -218,7 +211,6 @@ void iSeries_pcibios_init(void)
 			pdn->busno = bus;
 			pdn->devfn = (reg[0] >> 8) & 0xff;
 			pdn->bussubno = *busp;
-			pdn->LogicalSlot = *lsn;
 		}
 	}
 }
diff --git a/trunk/include/asm-powerpc/pci-bridge.h b/trunk/include/asm-powerpc/pci-bridge.h
index 09079e400d2b..84a3075db524 100644
--- a/trunk/include/asm-powerpc/pci-bridge.h
+++ b/trunk/include/asm-powerpc/pci-bridge.h
@@ -78,10 +78,6 @@ struct pci_dn {
 	struct	iommu_table *iommu_table;	/* for phb's or bridges */
 	struct	pci_dev *pcidev;	/* back-pointer to the pci device */
 	struct	device_node *node;	/* back-pointer to the device_node */
-#ifdef CONFIG_PPC_ISERIES
-	int	Flags;			/* Possible flags(disable/bist)*/
-	u8	LogicalSlot;		/* Hv Slot Index for Tces */
-#endif
 	u32	config_space[16];	/* saved PCI config space */
 };