Message ID | 4c5e4d0d1819028466748ed684254fec41aae816.1701696627.git.geert+renesas@glider.be (mailing list archive) |
---|---|
State | Mainlined |
Commit | a6921e6f41e8237ac355aac242cca237251a07a1 |
Delegated to: | Geert Uytterhoeven |
Headers | show |
Series | soc: renesas: Remove duplicate setup of soc_device_attribute.family | expand |
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c index 3d8e18923bddebf9..67de980ec4244c41 100644 --- a/drivers/soc/renesas/renesas-soc.c +++ b/drivers/soc/renesas/renesas-soc.c @@ -487,10 +487,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);
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> --- To be queued in renesas-devel for v6.8. drivers/soc/renesas/renesas-soc.c | 4 ---- 1 file changed, 4 deletions(-)