edac: cpc925: use for_each_of_cpu_node iterator

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This
has the side effect of defaulting to iterating using "cpu" node names in
preference to the deprecated (for FDT) device_type == "cpu".

The error messages are removed in the process as it's not the driver's
job to be checking cpu nodes. Any problems with cpu nodes should be
noticed by the architecture code.

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-edac@vger.kernel.org
Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index 2c98e020df05acb09f0aa5c412d2bbb62d9d29c7..3c0881ac9880467068da3751086c3b89ba7333cb 100644 (file)
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -593,8 +593,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci)
 /******************** CPU err device********************************/
 static u32 cpc925_cpu_mask_disabled(void)
 {
-       struct device_node *cpus;
-       struct device_node *cpunode = NULL;
+       struct device_node *cpunode;
        static u32 mask = 0;
 
        /* use cached value if available */
@@ -603,20 +602,8 @@ static u32 cpc925_cpu_mask_disabled(void)
 
        mask = APIMASK_ADI0 | APIMASK_ADI1;
 
-       cpus = of_find_node_by_path("/cpus");
-       if (cpus == NULL) {
-               cpc925_printk(KERN_DEBUG, "No /cpus node !\n");
-               return 0;
-       }
-
-       while ((cpunode = of_get_next_child(cpus, cpunode)) != NULL) {
+       for_each_of_cpu_node(cpunode) {
                const u32 *reg = of_get_property(cpunode, "reg", NULL);
-
-               if (strcmp(cpunode->type, "cpu")) {
-                       cpc925_printk(KERN_ERR, "Not a cpu node in /cpus: %s\n", cpunode->name);
-                       continue;
-               }
-
                if (reg == NULL || *reg > 2) {
                        cpc925_printk(KERN_ERR, "Bad reg value at %pOF\n", cpunode);
                        continue;
@@ -633,9 +620,6 @@ static u32 cpc925_cpu_mask_disabled(void)
                                "Assuming PI id is equal to CPU MPIC id!\n");
        }
 
-       of_node_put(cpunode);
-       of_node_put(cpus);
-
        return mask;
 }