aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-03-09 02:06:39 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 04:55:17 -0400
commit0bba2dd823fd995ed805ae5cbd5a1c1381257a12 (patch)
treeab88f46bcec15478b1effd3afbefcd133f26a8c7 /arch
parent3875c5c02d7112aa85f815d65d8add2e39ae9e34 (diff)
[SPARC64]: Kill pbm->pci_first_slot.
Set but never used. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/kernel/of_device.c6
-rw-r--r--arch/sparc64/kernel/pci_psycho.c7
-rw-r--r--arch/sparc64/kernel/pci_sabre.c1
-rw-r--r--arch/sparc64/kernel/pci_schizo.c1
-rw-r--r--arch/sparc64/kernel/pci_sun4v.c1
5 files changed, 2 insertions, 14 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,
759 * D: 2-bit slot number, derived from PCI device number as 759 * D: 2-bit slot number, derived from PCI device number as
760 * (dev - 1) for bus A, or (dev - 2) for bus B 760 * (dev - 1) for bus A, or (dev - 2) for bus B
761 * L: 2-bit line number 761 * L: 2-bit line number
762 *
763 * Actually, more "portable" way to calculate the funky
764 * slot number is to subtract pbm->pci_first_slot from the
765 * device number, and that's exactly what the pre-OF
766 * sparc64 code did, but we're building this stuff generically
767 * using the OBP tree, not in the PCI controller layer.
768 */ 762 */
769 if (bus & 0x80) { 763 if (bus & 0x80) {
770 /* PBM-A */ 764 /* 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,
1085 struct property *prop; 1085 struct property *prop;
1086 struct pci_pbm_info *pbm; 1086 struct pci_pbm_info *pbm;
1087 1087
1088 if (is_pbm_a) { 1088 if (is_pbm_a)
1089 pbm = &p->pbm_A; 1089 pbm = &p->pbm_A;
1090 pbm->pci_first_slot = 1; 1090 else
1091 } else {
1092 pbm = &p->pbm_B; 1091 pbm = &p->pbm_B;
1093 pbm->pci_first_slot = 2;
1094 }
1095 1092
1096 pbm->chip_type = PBM_CHIP_TYPE_PSYCHO; 1093 pbm->chip_type = PBM_CHIP_TYPE_PSYCHO;
1097 pbm->chip_version = 0; 1094 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
995 pbm->chip_type = PBM_CHIP_TYPE_SABRE; 995 pbm->chip_type = PBM_CHIP_TYPE_SABRE;
996 pbm->parent = p; 996 pbm->parent = p;
997 pbm->prom_node = dp; 997 pbm->prom_node = dp;
998 pbm->pci_first_slot = 1;
999 pbm->pci_first_busno = p->pci_first_busno; 998 pbm->pci_first_busno = p->pci_first_busno;
1000 pbm->pci_last_busno = p->pci_last_busno; 999 pbm->pci_last_busno = p->pci_last_busno;
1001 1000
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,
1528 pbm->portid = portid; 1528 pbm->portid = portid;
1529 pbm->parent = p; 1529 pbm->parent = p;
1530 pbm->prom_node = dp; 1530 pbm->prom_node = dp;
1531 pbm->pci_first_slot = 1;
1532 1531
1533 pbm->chip_type = chip_type; 1532 pbm->chip_type = chip_type;
1534 pbm->chip_version = of_getintprop_default(dp, "version#", 0); 1533 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
1256 1256
1257 pbm->parent = p; 1257 pbm->parent = p;
1258 pbm->prom_node = dp; 1258 pbm->prom_node = dp;
1259 pbm->pci_first_slot = 1;
1260 1259
1261 pbm->devhandle = devhandle; 1260 pbm->devhandle = devhandle;
1262 1261