Received-SPF: pass (google.com: domain of linux-kernel+bounces-29290-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <22084283-6854-41f9-b45a-4b27ce207f76@web.de>
Date: Wed, 17 Jan 2024 18:42:57 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: [PATCH 2/2] clk: versatile: clk-icst: Use common error handling code
 in icst_clk_setup()
Content-Language: en-GB
From: Markus Elfring <Markus.Elfring@web.de>
To: linux-clk@vger.kernel.org, kernel-janitors@vger.kernel.org,
 linux-arm-kernel@lists.infradead.org,
 Linus Walleij <linus.walleij@linaro.org>,
 Michael Turquette <mturquette@baylibre.com>, Rob Herring <robh@kernel.org>,
 Stephen Boyd <sboyd@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>, Kunwu Chan <chentao@kylinos.cn>
References: <061aef8b-a41f-4346-af6e-560c7594b27b@web.de>
In-Reply-To: <061aef8b-a41f-4346-af6e-560c7594b27b@web.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:fAHvs1aGqkk=;rN+3696c0VFb7jWKXBuvwLNtspy
 qxckwuivcuutKifP9gz+fzwRBOCors4B9h0HWryqR/DaeU0WMicW7cK9UT2rI4peXkzBILUyq
 Hw+UR2S4CqiF8i58TLYOO8jVh5z5mrpknoIeNHNMWSb1aOTbTfz8U2aqZKnt9qcZP9+Sx7hsx
 KZ1K+qk9PiRHptCPm5GK483R6qmVlR1XcNJqMfBlx47Ca+Gz30xhgY5YNTWg69z5l45fOK7Fz
 0RtMtycOgro1TgkRLaLBvOjIhlVmwk/T+1LZBRgw5aNAll/3/VH5oKhSkchi+EBvT/ku3m2ht
 TBccrI0wW6qSRopiEl52aF4N+lIWbiY7Wi7K17dwAyLIxPD/KhdCfdM7jFXnSEwY9/v1MsLqt
 h6/lFJ6+V1Gkzd2r095xWsS+w2YvUZNSIomjsZ8qKQSGziLPzFY1SPXXlg8c8clkYRhyqtjEn
 3mMJmLSx41VIOwiOuNRrtcX/tdDuX8f4AHikdtSrzsfzeLkTN1R3xq9V/ANguPDU6jLDY4d5h
 caVtVgkBhO/urfiuQlW2MIHac2gJc2qc3rCt+Wc/eXZTlZq6dkqQx6nKyy3Jy8VrZvJ14AXBN
 32rzbYzHmmBYZvWMupAe2kYGWjnfuHztwTMC1yG5B12PKnGGIjgdikNdVNibr3zRvoedZc12G
 OOJ0umK2OP6vnVpOLZQzh07Y87bs7JYlGkDxqZbYDq7tVbHKyeAX3F+FB70jctqT+osJQkBdG
 PCtMQjS+Hf9HlmHJZCPIVW901dCEe1zW2RU/sjlCw4SwqWXdlTLYNXZWeNCl5nr7MJ46XOkf/
 q1SYJXenSRc7EM12Htz98QfG7qGdUjsZbJ2jJCRVcPjQYwWoLFBYyZ+73LVYXu9AjM6o4O+cM
 HgDMKgdvS2F/qBoIAph1SPGq3xaUmL7RfEW1i+wLk/Hs/Rx7eH3pqFwuMWKCOQEal1JowcuEC
 huKtOQ==

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 17 Jan 2024 18:18:25 +0100

Add a jump target so that a bit of exception handling can be better reused
in an if branch of this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
=2D--
 drivers/clk/versatile/clk-icst.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-=
icst.c
index c4cf50a48972..9957dc9b8941 100644
=2D-- a/drivers/clk/versatile/clk-icst.c
+++ b/drivers/clk/versatile/clk-icst.c
@@ -351,8 +351,8 @@ struct clk *icst_clk_setup(struct device *dev,

 	pclone =3D kmemdup(desc->params, sizeof(*pclone), GFP_KERNEL);
 	if (!pclone) {
-		kfree(icst);
-		return ERR_PTR(-ENOMEM);
+		clk =3D ERR_PTR(-ENOMEM);
+		goto free_icst;
 	}

 	init.name =3D name;
@@ -370,6 +370,7 @@ struct clk *icst_clk_setup(struct device *dev,
 	clk =3D clk_register(dev, &icst->hw);
 	if (IS_ERR(clk)) {
 		kfree(pclone);
+free_icst:
 		kfree(icst);
 	}

=2D-
2.43.0