diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-10 03:19:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-11 02:07:59 -0400 |
commit | 22fecbae4446ad470b9237ee9b79f80f343b3838 (patch) | |
tree | 91f10500f68cf757804966c2e90100bf1556bd53 /arch/sparc64/kernel/pci_psycho.c | |
parent | d3ae4b5bc7186a53731d35187ad4ba3bca147cf6 (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_psycho.c')
-rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 70a7af092be2..4562b3e0b544 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c | |||
@@ -690,7 +690,7 @@ static irqreturn_t psycho_pcierr_intr(int irq, void *dev_id) | |||
690 | #define PSYCHO_ECCCTRL_CE 0x2000000000000000UL /* Enable CE INterrupts */ | 690 | #define PSYCHO_ECCCTRL_CE 0x2000000000000000UL /* Enable CE INterrupts */ |
691 | static void psycho_register_error_handlers(struct pci_pbm_info *pbm) | 691 | static void psycho_register_error_handlers(struct pci_pbm_info *pbm) |
692 | { | 692 | { |
693 | struct of_device *op = of_find_device_by_node(pbm->prom_node); | 693 | struct of_device *op = of_find_device_by_node(pbm->op->node); |
694 | unsigned long base = pbm->controller_regs; | 694 | unsigned long base = pbm->controller_regs; |
695 | u64 tmp; | 695 | u64 tmp; |
696 | int err; | 696 | int err; |
@@ -967,7 +967,7 @@ static void __init psycho_pbm_init(struct pci_pbm_info *pbm, | |||
967 | pbm->chip_version = of_getintprop_default(dp, "version#", 0); | 967 | pbm->chip_version = of_getintprop_default(dp, "version#", 0); |
968 | pbm->chip_revision = of_getintprop_default(dp, "module-revision#", 0); | 968 | pbm->chip_revision = of_getintprop_default(dp, "module-revision#", 0); |
969 | 969 | ||
970 | pbm->prom_node = dp; | 970 | pbm->op = op; |
971 | pbm->name = dp->full_name; | 971 | pbm->name = dp->full_name; |
972 | 972 | ||
973 | printk(KERN_INFO "%s: PSYCHO PCI Bus Module ver[%x:%x]\n", | 973 | printk(KERN_INFO "%s: PSYCHO PCI Bus Module ver[%x:%x]\n", |