aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2017-07-18 17:42:59 -0400
committerBorislav Petkov <bp@suse.de>2017-07-19 01:42:41 -0400
commit2efdda4a41086aaf62a1a89e898514d674a8b727 (patch)
treecf7808a71209f5562e70709506749b4ef1700afe
parentc54182ec0e157988f0cafd1e8d37b68ab4210f87 (diff)
EDAC, cpc925, ppc4xx: Convert to using %pOF instead of full_name
Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node. Signed-off-by: Rob Herring <robh@kernel.org> Cc: devicetree@vger.kernel.org Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/20170718214339.7774-19-robh@kernel.org Signed-off-by: Borislav Petkov <bp@suse.de>
-rw-r--r--drivers/edac/cpc925_edac.c2
-rw-r--r--drivers/edac/ppc4xx_edac.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index cba8ee14a067..2c98e020df05 100644
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -618,7 +618,7 @@ static u32 cpc925_cpu_mask_disabled(void)
618 } 618 }
619 619
620 if (reg == NULL || *reg > 2) { 620 if (reg == NULL || *reg > 2) {
621 cpc925_printk(KERN_ERR, "Bad reg value at %s\n", cpunode->full_name); 621 cpc925_printk(KERN_ERR, "Bad reg value at %pOF\n", cpunode);
622 continue; 622 continue;
623 } 623 }
624 624
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 98d6dc7ef8e8..fd3202c30f69 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -1266,8 +1266,8 @@ static int ppc4xx_edac_probe(struct platform_device *op)
1266 memcheck = (mcopt1 & SDRAM_MCOPT1_MCHK_MASK); 1266 memcheck = (mcopt1 & SDRAM_MCOPT1_MCHK_MASK);
1267 1267
1268 if (memcheck == SDRAM_MCOPT1_MCHK_NON) { 1268 if (memcheck == SDRAM_MCOPT1_MCHK_NON) {
1269 ppc4xx_edac_printk(KERN_INFO, "%s: No ECC memory detected or " 1269 ppc4xx_edac_printk(KERN_INFO, "%pOF: No ECC memory detected or "
1270 "ECC is disabled.\n", np->full_name); 1270 "ECC is disabled.\n", np);
1271 status = -ENODEV; 1271 status = -ENODEV;
1272 goto done; 1272 goto done;
1273 } 1273 }
@@ -1286,9 +1286,9 @@ static int ppc4xx_edac_probe(struct platform_device *op)
1286 mci = edac_mc_alloc(ppc4xx_edac_instance, ARRAY_SIZE(layers), layers, 1286 mci = edac_mc_alloc(ppc4xx_edac_instance, ARRAY_SIZE(layers), layers,
1287 sizeof(struct ppc4xx_edac_pdata)); 1287 sizeof(struct ppc4xx_edac_pdata));
1288 if (mci == NULL) { 1288 if (mci == NULL) {
1289 ppc4xx_edac_printk(KERN_ERR, "%s: " 1289 ppc4xx_edac_printk(KERN_ERR, "%pOF: "
1290 "Failed to allocate EDAC MC instance!\n", 1290 "Failed to allocate EDAC MC instance!\n",
1291 np->full_name); 1291 np);
1292 status = -ENOMEM; 1292 status = -ENOMEM;
1293 goto done; 1293 goto done;
1294 } 1294 }