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: 13478437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9F3AAC10DC1 for ; Mon, 4 Dec 2023 13:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=bGtAd3Y/6U7UnOFZWIjg++ch/La/2ohkwLBr5FV0t1I=; b=1NhAV8r2QZKp43 pbHsL22SyeikFX0w4cDe6JyDXDDOwp1l/PwaYbvhJkzBVwWjWlu3sZjiFKuJaetnR7y0U+vtD+NGk TX/AmSbuZMW4DjSrKtKqEQhh9pxwoivD8vg5985OKBSoRvmxgJISJnFeET1sdLvRN7Ptqd+F4nwNL W7Ff5kWf4i1PJGxOMKfCFTFD2Onnkco8bP8lBpW8EQZ0ECyb6vXBzkfX3mJsG44dyxKqJef51vw3q kVT7ccbP+LEZWNoxt8aC+phty0DImN70ps8V1WShNO4kI8xh3rFpUDmidmBVTYXYhsYCJdneulDmz itUlMil3KgNRw7n2qXbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rA93b-004enU-0W; Mon, 04 Dec 2023 13:32:19 +0000 Received: from andre.telenet-ops.be ([2a02:1800:120:4::f00:15]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rA93Y-004eks-1d for linux-arm-kernel@lists.infradead.org; Mon, 04 Dec 2023 13:32:18 +0000 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 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231204_053216_702896_4FA1FB3D X-CRM114-Status: UNSURE ( 9.91 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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);