Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0bba2dd823fd995ed805ae5cbd5a1c1381257a12
Commit:     0bba2dd823fd995ed805ae5cbd5a1c1381257a12
Parent:     3875c5c02d7112aa85f815d65d8add2e39ae9e34
Author:     David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 8 23:06:39 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Apr 26 01:55:17 2007 -0700

    [SPARC64]: Kill pbm->pci_first_slot.
    
    Set but never used.
    
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 arch/sparc64/kernel/of_device.c  |    6 ------
 arch/sparc64/kernel/pci_psycho.c |    7 ++-----
 arch/sparc64/kernel/pci_sabre.c  |    1 -
 arch/sparc64/kernel/pci_schizo.c |    1 -
 arch/sparc64/kernel/pci_sun4v.c  |    1 -
 include/asm-sparc64/pbm.h        |    3 ---
 6 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 8964eac..f18eec6 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 0ab2aa0..2e5d40a 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 cef81c8..1bd7fc7 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 99912db..f1f105a 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 b63ef26..c6feae6 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 43b07b9..3a811c2 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to