From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 5 Sep 2024 04:17:19 +0000 (-0700)
Subject: Input: ps2-gpio - use guard notation when acquiring mutex
X-Git-Tag: microblaze-v6.16~145^2~5^2~44
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=31b6b9a46d0af9c1ec7133e41302b3ef76016b04;p=linux-2.6-microblaze.git

Input: ps2-gpio - use guard notation when acquiring mutex

Using guard notation makes the code more compact and error handling
more robust by ensuring that mutexes are released in all code paths
when control leaves critical section.

Link: https://lore.kernel.org/r/20240905041732.2034348-15-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
index 3a431395c464..3e4ae2cc6552 100644
--- a/drivers/input/serio/ps2-gpio.c
+++ b/drivers/input/serio/ps2-gpio.c
@@ -133,12 +133,12 @@ static int ps2_gpio_write(struct serio *serio, unsigned char val)
 	int ret = 0;
 
 	if (in_task()) {
-		mutex_lock(&drvdata->tx.mutex);
+		guard(mutex)(&drvdata->tx.mutex);
+
 		__ps2_gpio_write(serio, val);
 		if (!wait_for_completion_timeout(&drvdata->tx.complete,
 						 msecs_to_jiffies(10000)))
 			ret = SERIO_TIMEOUT;
-		mutex_unlock(&drvdata->tx.mutex);
 	} else {
 		__ps2_gpio_write(serio, val);
 	}