From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> Date: Sun, 24 Dec 2023 15:56:08 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> --- drivers/clk/ti/clkctrl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c index 82b48548818b..5a1bd176160c 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c @@ -590,10 +590,9 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) if (clkctrl_name) { provider->clkdm_name = kasprintf(GFP_KERNEL, "%s_clkdm", clkctrl_name); - if (!provider->clkdm_name) { - kfree(provider); - return; - } + if (!provider->clkdm_name) + goto free_provider; + goto clkdm_found; } @@ -603,10 +602,8 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) */ if (legacy_naming) { provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFnxxx", node->parent); - if (!provider->clkdm_name) { - kfree(provider); - return; - } + if (!provider->clkdm_name) + goto free_provider; /* * Create default clkdm name, replace _cm from end of parent @@ -615,10 +612,8 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; } else { provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFn", node); - if (!provider->clkdm_name) { - kfree(provider); - return; - } + if (!provider->clkdm_name) + goto free_provider; /* * Create default clkdm name, replace _clkctrl from end of @@ -710,4 +705,8 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) return; +free_provider: + kfree(provider); + return; + cleanup: -- 2.43.0