]> git.itanic.dy.fi Git - linux-stable/commitdiff
soc: renesas: Remove duplicate setup of soc_device_attribute.family
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 4 Dec 2023 13:32:03 +0000 (14:32 +0100)
committerGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 13 Dec 2023 16:22:43 +0000 (17:22 +0100)
As of commit 3f84aa5ec052dba9 ("base: soc: populate machine name in
soc_device_register if empty") in v6.4, soc_device_register() fills in
soc_device_attribute.family when it is still empty.  Hence the identical
code in renesas_soc_init() doing the same can be removed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/4c5e4d0d1819028466748ed684254fec41aae816.1701696627.git.geert+renesas@glider.be
drivers/soc/renesas/renesas-soc.c

index c732d4a5b26aed8a5f925c45e20266f84ebf66f4..27eae1a354ab23296fea4a873d72b038c323b290 100644 (file)
@@ -486,10 +486,6 @@ static int __init renesas_soc_init(void)
                return -ENOMEM;
        }
 
-       np = of_find_node_by_path("/");
-       of_property_read_string(np, "model", &soc_dev_attr->machine);
-       of_node_put(np);
-
        soc_dev_attr->family = kstrdup_const(family->name, GFP_KERNEL);
        soc_dev_attr->soc_id = kstrdup_const(soc_id, GFP_KERNEL);