diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-03-09 01:11:00 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 04:55:12 -0400 |
commit | 229177c7f38d6a2b1285b42da4b19d76346b4bac (patch) | |
tree | 516b4586e3cf03722f35adc212c38f57dd94f212 | |
parent | 9fd8b64761d3fe7e4ef567161be57e4234af5c1c (diff) |
[SPARC64]: Kill PBM intmap software state.
Set but never used.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 12 | ||||
-rw-r--r-- | arch/sparc64/kernel/pci_schizo.c | 8 | ||||
-rw-r--r-- | arch/sparc64/kernel/pci_sun4v.c | 8 | ||||
-rw-r--r-- | include/asm-sparc64/pbm.h | 3 |
4 files changed, 0 insertions, 31 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index c08681b7a44e..7b7010a1eb2f 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c | |||
@@ -1175,18 +1175,6 @@ static void psycho_pbm_init(struct pci_controller_info *p, | |||
1175 | pbm->num_pbm_ranges = 0; | 1175 | pbm->num_pbm_ranges = 0; |
1176 | } | 1176 | } |
1177 | 1177 | ||
1178 | prop = of_find_property(dp, "interrupt-map", &len); | ||
1179 | if (prop) { | ||
1180 | pbm->pbm_intmap = prop->value; | ||
1181 | pbm->num_pbm_intmap = | ||
1182 | (len / sizeof(struct linux_prom_pci_intmap)); | ||
1183 | |||
1184 | prop = of_find_property(dp, "interrupt-map-mask", NULL); | ||
1185 | pbm->pbm_intmask = prop->value; | ||
1186 | } else { | ||
1187 | pbm->num_pbm_intmap = 0; | ||
1188 | } | ||
1189 | |||
1190 | prop = of_find_property(dp, "bus-range", NULL); | 1178 | prop = of_find_property(dp, "bus-range", NULL); |
1191 | busrange = prop->value; | 1179 | busrange = prop->value; |
1192 | pbm->pci_first_busno = busrange[0]; | 1180 | pbm->pci_first_busno = busrange[0]; |
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c index 79ad2688317b..81daf903bdf4 100644 --- a/arch/sparc64/kernel/pci_schizo.c +++ b/arch/sparc64/kernel/pci_schizo.c | |||
@@ -1607,14 +1607,6 @@ static void schizo_pbm_init(struct pci_controller_info *p, | |||
1607 | 1607 | ||
1608 | pci_determine_mem_io_space(pbm); | 1608 | pci_determine_mem_io_space(pbm); |
1609 | 1609 | ||
1610 | pbm->pbm_intmap = of_get_property(dp, "interrupt-map", &len); | ||
1611 | if (pbm->pbm_intmap) { | ||
1612 | pbm->num_pbm_intmap = | ||
1613 | (len / sizeof(struct linux_prom_pci_intmap)); | ||
1614 | pbm->pbm_intmask = | ||
1615 | of_get_property(dp, "interrupt-map-mask", NULL); | ||
1616 | } | ||
1617 | |||
1618 | ino_bitmap = of_get_property(dp, "ino-bitmap", NULL); | 1610 | ino_bitmap = of_get_property(dp, "ino-bitmap", NULL); |
1619 | pbm->ino_bitmap = (((u64)ino_bitmap[1] << 32UL) | | 1611 | pbm->ino_bitmap = (((u64)ino_bitmap[1] << 32UL) | |
1620 | ((u64)ino_bitmap[0] << 0UL)); | 1612 | ((u64)ino_bitmap[0] << 0UL)); |
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index e1af009617cf..7bee6b19272e 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c | |||
@@ -1332,14 +1332,6 @@ static void pci_sun4v_pbm_init(struct pci_controller_info *p, struct device_node | |||
1332 | 1332 | ||
1333 | pci_determine_mem_io_space(pbm); | 1333 | pci_determine_mem_io_space(pbm); |
1334 | 1334 | ||
1335 | prop = of_find_property(dp, "interrupt-map", &len); | ||
1336 | pbm->pbm_intmap = prop->value; | ||
1337 | pbm->num_pbm_intmap = | ||
1338 | (len / sizeof(struct linux_prom_pci_intmap)); | ||
1339 | |||
1340 | prop = of_find_property(dp, "interrupt-map-mask", NULL); | ||
1341 | pbm->pbm_intmask = prop->value; | ||
1342 | |||
1343 | pci_sun4v_get_bus_range(pbm); | 1335 | pci_sun4v_get_bus_range(pbm); |
1344 | pci_sun4v_iommu_init(pbm); | 1336 | pci_sun4v_iommu_init(pbm); |
1345 | pci_sun4v_msi_init(pbm); | 1337 | pci_sun4v_msi_init(pbm); |
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h index 88974d685a3d..f31de45f4873 100644 --- a/include/asm-sparc64/pbm.h +++ b/include/asm-sparc64/pbm.h | |||
@@ -162,9 +162,6 @@ struct pci_pbm_info { | |||
162 | struct device_node *prom_node; | 162 | struct device_node *prom_node; |
163 | struct linux_prom_pci_ranges *pbm_ranges; | 163 | struct linux_prom_pci_ranges *pbm_ranges; |
164 | int num_pbm_ranges; | 164 | int num_pbm_ranges; |
165 | struct linux_prom_pci_intmap *pbm_intmap; | ||
166 | int num_pbm_intmap; | ||
167 | struct linux_prom_pci_intmask *pbm_intmask; | ||
168 | u64 ino_bitmap; | 165 | u64 ino_bitmap; |
169 | 166 | ||
170 | /* PBM I/O and Memory space resources. */ | 167 | /* PBM I/O and Memory space resources. */ |