6 files changed, 2 insertions, 17 deletions

diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 8964eacb0048..f18eec6ad691 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -759,12 +759,6 @@ static unsigned int __init pci_irq_swizzle(struct device_node *dp,
                  * D: 2-bit slot number, derived from PCI device number as
                  *    (dev - 1) for bus A, or (dev - 2) for bus B
                  * L: 2-bit line number
-                 *
-                 * Actually, more "portable" way to calculate the funky
-                 * slot number is to subtract pbm->pci_first_slot from the
-                 * device number, and that's exactly what the pre-OF
-                 * sparc64 code did, but we're building this stuff generically
-                 * using the OBP tree, not in the PCI controller layer.
                  */
                 if (bus & 0x80) {
                         /* PBM-A */
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 0ab2aa0261ce..2e5d40a26dbd 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1085,13 +1085,10 @@ static void psycho_pbm_init(struct pci_controller_info *p,
         struct property *prop;
         struct pci_pbm_info *pbm;
 
-        if (is_pbm_a) {
+        if (is_pbm_a)
                 pbm = &p->pbm_A;
-                pbm->pci_first_slot = 1;
-        } else {
+        else
                 pbm = &p->pbm_B;
-                pbm->pci_first_slot = 2;
-        }
 
         pbm->chip_type = PBM_CHIP_TYPE_PSYCHO;
         pbm->chip_version = 0;
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index cef81c88548a..1bd7fc7c05e6 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -995,7 +995,6 @@ static void sabre_pbm_init(struct pci_controller_info *p, struct device_node *dp
         pbm->chip_type = PBM_CHIP_TYPE_SABRE;
         pbm->parent = p;
         pbm->prom_node = dp;
-        pbm->pci_first_slot = 1;
         pbm->pci_first_busno = p->pci_first_busno;
         pbm->pci_last_busno = p->pci_last_busno;
 
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index 99912db4e7e8..f1f105af8d3c 100644
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -1528,7 +1528,6 @@ static void schizo_pbm_init(struct pci_controller_info *p,
         pbm->portid = portid;
         pbm->parent = p;
         pbm->prom_node = dp;
-        pbm->pci_first_slot = 1;
 
         pbm->chip_type = chip_type;
         pbm->chip_version = of_getintprop_default(dp, "version#", 0);
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index b63ef26abf02..c6feae6e9690 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -1256,7 +1256,6 @@ static void pci_sun4v_pbm_init(struct pci_controller_info *p, struct device_node
 
         pbm->parent = p;
         pbm->prom_node = dp;
-        pbm->pci_first_slot = 1;
 
         pbm->devhandle = devhandle;
 
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h
index 43b07b9b42c5..3a811c2cd3c2 100644
--- a/include/asm-sparc64/pbm.h
+++ b/include/asm-sparc64/pbm.h
@@ -197,9 +197,6 @@ struct pci_pbm_info {
         /* IOMMU state, potentially shared by both PBM segments. */
         struct pci_iommu                *iommu;
 
-        /* PCI slot mapping. */
-        unsigned int                    pci_first_slot;
-
         /* Now things for the actual PCI bus probes. */
         unsigned int                    pci_first_busno;
         unsigned int                    pci_last_busno;