[openwrt/openwrt] lantiq: use devm for mutex_init

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 28 10:57:28 PST 2024


ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/67da3d33f3df328f89780bc0c79e1620dc47267a

commit 67da3d33f3df328f89780bc0c79e1620dc47267a
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Thu Oct 31 12:22:04 2024 -0700

    lantiq: use devm for mutex_init
    
    It's common to avoid calling mutex_destroy when done. It's not correct strictly speaking.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/16832
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    (cherry picked from commit fccff963c0a6ba035455daea61566f4d121643e3)
    Link: https://github.com/openwrt/openwrt/pull/17097
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 .../patches-6.6/0008-MIPS-lantiq-backport-old-timer-code.patch      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/linux/lantiq/patches-6.6/0008-MIPS-lantiq-backport-old-timer-code.patch b/target/linux/lantiq/patches-6.6/0008-MIPS-lantiq-backport-old-timer-code.patch
index 81bf72913b..a396efd990 100644
--- a/target/linux/lantiq/patches-6.6/0008-MIPS-lantiq-backport-old-timer-code.patch
+++ b/target/linux/lantiq/patches-6.6/0008-MIPS-lantiq-backport-old-timer-code.patch
@@ -186,7 +186,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  obj-y += vmmc.o
 --- /dev/null
 +++ b/arch/mips/lantiq/xway/timer.c
-@@ -0,0 +1,886 @@
+@@ -0,0 +1,888 @@
 +#ifndef CONFIG_SOC_AMAZON_SE
 +
 +#include <linux/kernel.h>
@@ -989,7 +989,9 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	ltq_w32(0xfff, LQ_GPTU_IRNCR);
 +
 +	memset(&timer_dev, 0, sizeof(timer_dev));
-+	mutex_init(&timer_dev.gptu_mutex);
++	ret = devm_mutex_init(&pdev->dev, &timer_dev.gptu_mutex);
++	if (ret)
++		return ret;
 +
 +	lq_enable_gptu();
 +	timer_dev.number_of_timers = GPTU_ID_CFG * 2;




More information about the lede-commits mailing list