From patchwork Mon Dec 4 13:32:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13478438 X-Patchwork-Delegate: geert@linux-m68k.org Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E9FDA1 for ; Mon, 4 Dec 2023 05:32:09 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f143:dd2b:2cfe:eb7c]) by andre.telenet-ops.be with bizsmtp id JDY42B00J5Tnyl201DY4yE; Mon, 04 Dec 2023 14:32:07 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1rA932-00Awgb-Bo; Mon, 04 Dec 2023 14:32:04 +0100 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1rA93M-002C9A-96; Mon, 04 Dec 2023 14:32:04 +0100 From: Geert Uytterhoeven To: Magnus Damm Cc: Heiner Kallweit , linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven Subject: [PATCH] soc: renesas: Remove duplicate setup of soc_device_attribute.family Date: Mon, 4 Dec 2023 14:32:03 +0100 Message-Id: <4c5e4d0d1819028466748ed684254fec41aae816.1701696627.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- To be queued in renesas-devel for v6.8. drivers/soc/renesas/renesas-soc.c | 4 ---- 1 file changed, 4 deletions(-) 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);