2022-07-15 14:20:37

by Geert Uytterhoeven

Subject: [PATCH 2/2] of: overlay: Simplify of_overlay_fdt_apply() tail

It does not hurt to fill in the changeset id while the mutex is still
held. After doing so, the function tails for the success and failure
cases become identical, so they can be unified.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/of/overlay.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 84a8d402009cb3b2..bd8ff4df723da217 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -1043,20 +1043,15 @@ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
* goto err_free_ovcs. Instead, the caller of of_overlay_fdt_apply()
* can call of_overlay_remove();
*/
-
- mutex_unlock(&of_mutex);
- of_overlay_mutex_unlock();
-
*ret_ovcs_id = ovcs->id;
-
- return ret;
+ goto out_unlock;

err_free_ovcs:
free_overlay_changeset(ovcs);

+out_unlock:
mutex_unlock(&of_mutex);
of_overlay_mutex_unlock();
-
return ret;
}
EXPORT_SYMBOL_GPL(of_overlay_fdt_apply);
--
2.25.1

2022-07-19 22:24:03

by Rob Herring (Arm)

Subject: Re: [PATCH 2/2] of: overlay: Simplify of_overlay_fdt_apply() tail

On Fri, 15 Jul 2022 16:03:15 +0200, Geert Uytterhoeven wrote:
> It does not hurt to fill in the changeset id while the mutex is still
> held. After doing so, the function tails for the success and failure
> cases become identical, so they can be unified.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> drivers/of/overlay.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>

Applied, thanks!