]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mtd: nand: Use scoped_guard for mutex in nand_resume
authorRichard Lyu <richard.lyu@suse.com>
Tue, 10 Mar 2026 16:30:43 +0000 (00:30 +0800)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 11 Mar 2026 15:34:12 +0000 (16:34 +0100)
Refactor nand_resume() to use scoped_guard() instead of explicit
mutex_lock/unlock. This improves code safety by ensuring the mutex
is always released through the RAII-based cleanup infrastructure.

The behavior is functionally equivalent. The mutex is released at the
end of the scoped block, after which wake_up_all() is called to
preserve the original locking semantics.

Signed-off-by: Richard Lyu <richard.lyu@suse.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
drivers/mtd/nand/raw/nand_base.c

index 38429363251ca7a0690ff3fd369d1ec58a2c51fd..5c89517418557581548195092d08a0b978000dd0 100644 (file)
@@ -43,6 +43,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/gpio/consumer.h>
+#include <linux/cleanup.h>
 
 #include "internals.h"
 
@@ -4704,16 +4705,16 @@ static void nand_resume(struct mtd_info *mtd)
 {
        struct nand_chip *chip = mtd_to_nand(mtd);
 
-       mutex_lock(&chip->lock);
-       if (chip->suspended) {
-               if (chip->ops.resume)
-                       chip->ops.resume(chip);
-               chip->suspended = 0;
-       } else {
-               pr_err("%s called for a chip which is not in suspended state\n",
-                       __func__);
+       scoped_guard(mutex, &chip->lock) {
+               if (chip->suspended) {
+                       if (chip->ops.resume)
+                               chip->ops.resume(chip);
+                       chip->suspended = 0;
+               } else {
+                       pr_err("%s called for a chip which is not in suspended state\n",
+                               __func__);
+               }
        }
-       mutex_unlock(&chip->lock);
 
        wake_up_all(&chip->resume_wq);
 }