Commit a26f95fed31d917eee616d1cd6360e4ce782e3dc
Committed by
Grant Likely
1 parent
4eecb17825
Exists in
master
and in
7 other branches
of/edac: fix build breakage in drivers
Fixes build errors in EDAC drivers caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Showing 2 changed files with 9 additions and 9 deletions Side-by-side Diff
drivers/edac/mpc85xx_edac.c
... | ... | @@ -229,7 +229,7 @@ |
229 | 229 | |
230 | 230 | pdata->edac_idx = edac_pci_idx++; |
231 | 231 | |
232 | - res = of_address_to_resource(op->node, 0, &r); | |
232 | + res = of_address_to_resource(op->dev.of_node, 0, &r); | |
233 | 233 | if (res) { |
234 | 234 | printk(KERN_ERR "%s: Unable to get resource for " |
235 | 235 | "PCI err regs\n", __func__); |
... | ... | @@ -274,7 +274,7 @@ |
274 | 274 | } |
275 | 275 | |
276 | 276 | if (edac_op_state == EDAC_OPSTATE_INT) { |
277 | - pdata->irq = irq_of_parse_and_map(op->node, 0); | |
277 | + pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0); | |
278 | 278 | res = devm_request_irq(&op->dev, pdata->irq, |
279 | 279 | mpc85xx_pci_isr, IRQF_DISABLED, |
280 | 280 | "[EDAC] PCI err", pci); |
... | ... | @@ -529,7 +529,7 @@ |
529 | 529 | edac_dev->ctl_name = pdata->name; |
530 | 530 | edac_dev->dev_name = pdata->name; |
531 | 531 | |
532 | - res = of_address_to_resource(op->node, 0, &r); | |
532 | + res = of_address_to_resource(op->dev.of_node, 0, &r); | |
533 | 533 | if (res) { |
534 | 534 | printk(KERN_ERR "%s: Unable to get resource for " |
535 | 535 | "L2 err regs\n", __func__); |
... | ... | @@ -576,7 +576,7 @@ |
576 | 576 | } |
577 | 577 | |
578 | 578 | if (edac_op_state == EDAC_OPSTATE_INT) { |
579 | - pdata->irq = irq_of_parse_and_map(op->node, 0); | |
579 | + pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0); | |
580 | 580 | res = devm_request_irq(&op->dev, pdata->irq, |
581 | 581 | mpc85xx_l2_isr, IRQF_DISABLED, |
582 | 582 | "[EDAC] L2 err", edac_dev); |
... | ... | @@ -978,7 +978,7 @@ |
978 | 978 | mci->ctl_name = pdata->name; |
979 | 979 | mci->dev_name = pdata->name; |
980 | 980 | |
981 | - res = of_address_to_resource(op->node, 0, &r); | |
981 | + res = of_address_to_resource(op->dev.of_node, 0, &r); | |
982 | 982 | if (res) { |
983 | 983 | printk(KERN_ERR "%s: Unable to get resource for MC err regs\n", |
984 | 984 | __func__); |
... | ... | @@ -1052,7 +1052,7 @@ |
1052 | 1052 | out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_SBE, 0x10000); |
1053 | 1053 | |
1054 | 1054 | /* register interrupts */ |
1055 | - pdata->irq = irq_of_parse_and_map(op->node, 0); | |
1055 | + pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0); | |
1056 | 1056 | res = devm_request_irq(&op->dev, pdata->irq, |
1057 | 1057 | mpc85xx_mc_isr, |
1058 | 1058 | IRQF_DISABLED | IRQF_SHARED, |
drivers/edac/ppc4xx_edac.c
... | ... | @@ -1022,7 +1022,7 @@ |
1022 | 1022 | int status = 0; |
1023 | 1023 | const u32 memcheck = (mcopt1 & SDRAM_MCOPT1_MCHK_MASK); |
1024 | 1024 | struct ppc4xx_edac_pdata *pdata = NULL; |
1025 | - const struct device_node *np = op->node; | |
1025 | + const struct device_node *np = op->dev.of_node; | |
1026 | 1026 | |
1027 | 1027 | if (match == NULL) |
1028 | 1028 | return -EINVAL; |
... | ... | @@ -1113,7 +1113,7 @@ |
1113 | 1113 | int status = 0; |
1114 | 1114 | int ded_irq, sec_irq; |
1115 | 1115 | struct ppc4xx_edac_pdata *pdata = mci->pvt_info; |
1116 | - struct device_node *np = op->node; | |
1116 | + struct device_node *np = op->dev.of_node; | |
1117 | 1117 | |
1118 | 1118 | ded_irq = irq_of_parse_and_map(np, INTMAP_ECCDED_INDEX); |
1119 | 1119 | sec_irq = irq_of_parse_and_map(np, INTMAP_ECCSEC_INDEX); |
... | ... | @@ -1243,7 +1243,7 @@ |
1243 | 1243 | int status = 0; |
1244 | 1244 | u32 mcopt1, memcheck; |
1245 | 1245 | dcr_host_t dcr_host; |
1246 | - const struct device_node *np = op->node; | |
1246 | + const struct device_node *np = op->dev.of_node; | |
1247 | 1247 | struct mem_ctl_info *mci = NULL; |
1248 | 1248 | static int ppc4xx_edac_instance; |
1249 | 1249 |