aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/pci_schizo.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-10 03:19:28 -0400
committerDavid S. Miller <davem@davemloft.net>2008-09-11 02:07:59 -0400
commit22fecbae4446ad470b9237ee9b79f80f343b3838 (patch)
tree91f10500f68cf757804966c2e90100bf1556bd53 /arch/sparc64/kernel/pci_schizo.c
parentd3ae4b5bc7186a53731d35187ad4ba3bca147cf6 (diff)
sparc64: Record OF device instead of device node pointer in pci_pbm_info.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci_schizo.c')
-rw-r--r--arch/sparc64/kernel/pci_schizo.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index 67e3640bc69a..c30856541bb4 100644
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -862,7 +862,7 @@ static int pbm_routes_this_ino(struct pci_pbm_info *pbm, u32 ino)
862 */ 862 */
863static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm) 863static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
864{ 864{
865 struct of_device *op = of_find_device_by_node(pbm->prom_node); 865 struct of_device *op = of_find_device_by_node(pbm->op->node);
866 u64 tmp, err_mask, err_no_mask; 866 u64 tmp, err_mask, err_no_mask;
867 int err; 867 int err;
868 868
@@ -958,7 +958,7 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
958 958
959static void schizo_register_error_handlers(struct pci_pbm_info *pbm) 959static void schizo_register_error_handlers(struct pci_pbm_info *pbm)
960{ 960{
961 struct of_device *op = of_find_device_by_node(pbm->prom_node); 961 struct of_device *op = of_find_device_by_node(pbm->op->node);
962 u64 tmp, err_mask, err_no_mask; 962 u64 tmp, err_mask, err_no_mask;
963 int err; 963 int err;
964 964
@@ -1088,7 +1088,7 @@ static void __devinit schizo_scan_bus(struct pci_pbm_info *pbm,
1088{ 1088{
1089 pbm_config_busmastering(pbm); 1089 pbm_config_busmastering(pbm);
1090 pbm->is_66mhz_capable = 1090 pbm->is_66mhz_capable =
1091 (of_find_property(pbm->prom_node, "66mhz-capable", NULL) 1091 (of_find_property(pbm->op->node, "66mhz-capable", NULL)
1092 != NULL); 1092 != NULL);
1093 1093
1094 pbm->pci_bus = pci_scan_one_pbm(pbm, parent); 1094 pbm->pci_bus = pci_scan_one_pbm(pbm, parent);
@@ -1158,7 +1158,7 @@ static int schizo_pbm_iommu_init(struct pci_pbm_info *pbm)
1158 u32 dma_mask; 1158 u32 dma_mask;
1159 u64 control; 1159 u64 control;
1160 1160
1161 vdma = of_get_property(pbm->prom_node, "virtual-dma", NULL); 1161 vdma = of_get_property(pbm->op->node, "virtual-dma", NULL);
1162 if (!vdma) 1162 if (!vdma)
1163 vdma = vdma_default; 1163 vdma = vdma_default;
1164 1164
@@ -1288,7 +1288,7 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
1288 pbm->chip_version >= 0x2) 1288 pbm->chip_version >= 0x2)
1289 tmp |= 0x3UL << SCHIZO_PCICTRL_PTO_SHIFT; 1289 tmp |= 0x3UL << SCHIZO_PCICTRL_PTO_SHIFT;
1290 1290
1291 if (!of_find_property(pbm->prom_node, "no-bus-parking", NULL)) 1291 if (!of_find_property(pbm->op->node, "no-bus-parking", NULL))
1292 tmp |= SCHIZO_PCICTRL_PARK; 1292 tmp |= SCHIZO_PCICTRL_PARK;
1293 else 1293 else
1294 tmp &= ~SCHIZO_PCICTRL_PARK; 1294 tmp &= ~SCHIZO_PCICTRL_PARK;
@@ -1377,7 +1377,7 @@ static int __devinit schizo_pbm_init(struct pci_pbm_info *pbm,
1377 pbm->index = pci_num_pbms++; 1377 pbm->index = pci_num_pbms++;
1378 1378
1379 pbm->portid = portid; 1379 pbm->portid = portid;
1380 pbm->prom_node = dp; 1380 pbm->op = op;
1381 1381
1382 pbm->chip_type = chip_type; 1382 pbm->chip_type = chip_type;
1383 pbm->chip_version = of_getintprop_default(dp, "version#", 0); 1383 pbm->chip_version = of_getintprop_default(dp, "version#", 0);