clk: mediatek: clk-mt8173-apmixedsys: Use common error handling code in clk_mt8173_apmixed_probe()

Commit Message

Markus Elfring Feb. 26, 2024, 12:26 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Mon, 26 Feb 2024 13:10:37 +0100

Add a label so that a bit of exception handling can be better reused
at the end of this function implementation.

Signed-off-by: Markus Elfring <[e-mail]>
---
 drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--
2.43.2

Comments

AngeloGioacchino Del Regno Feb. 26, 2024, 12:33 p.m. UTC | #1

Il 26/02/24 13:26, Markus Elfring ha scritto:
> From: Markus Elfring <[e-mail]>
> Date: Mon, 26 Feb 2024 13:10:37 +0100
> 
> Add a label so that a bit of exception handling can be better reused
> at the end of this function implementation.
> 
> Signed-off-by: Markus Elfring <[e-mail]>

Reviewed-by: AngeloGiaocchino Del Regno <[e-mail]>

Stephen Boyd Feb. 29, 2024, 1:42 a.m. UTC | #2

Quoting Markus Elfring (2024-02-26 04:26:26)
> From: Markus Elfring <[e-mail]>
> Date: Mon, 26 Feb 2024 13:10:37 +0100
> 
> Add a label so that a bit of exception handling can be better reused
> at the end of this function implementation.
> 
> Signed-off-by: Markus Elfring <[e-mail]>
> ---

Applied to clk-next

Patch

diff --git a/drivers/clk/mediatek/clk-mt8173-apmixedsys.c b/drivers/clk/mediatek/clk-mt8173-apmixedsys.c
index 1bbb21ab1786..6cab483b8e1e 100644
--- a/drivers/clk/mediatek/clk-mt8173-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt8173-apmixedsys.c
@@ -152,8 +152,8 @@  static int clk_mt8173_apmixed_probe(struct platform_device *pdev)

 	clk_data = mtk_alloc_clk_data(CLK_APMIXED_NR_CLK);
 	if (IS_ERR_OR_NULL(clk_data)) {
-		iounmap(base);
-		return -ENOMEM;
+		r = -ENOMEM;
+		goto unmap_io;
 	}

 	fhctl_parse_dt(fhctl_node, pllfhs, ARRAY_SIZE(pllfhs));
@@ -188,6 +188,7 @@  static int clk_mt8173_apmixed_probe(struct platform_device *pdev)
 				  ARRAY_SIZE(pllfhs), clk_data);
 free_clk_data:
 	mtk_free_clk_data(clk_data);
+unmap_io:
 	iounmap(base);
 	return r;
 }