From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sun, 18 Aug 2024 00:14:57 +0000 (-0700)
Subject: Input: cyttsp - use guard notation when acquiring mutex
X-Git-Tag: v7.1-rc1~44^2^2~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0a92414af42b79f4e2829adfd55478a8e74eb33;p=thirdparty%2Flinux.git

Input: cyttsp - use guard notation when acquiring mutex

Guard notation simplifies code.

Also fix the touchscreen not being marked as suspended when noone has
opened/is using it.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

diff --git a/drivers/input/touchscreen/cyttsp_core.c b/drivers/input/touchscreen/cyttsp_core.c
index 9e729910fbc8..012dfcae01cc 100644
--- a/drivers/input/touchscreen/cyttsp_core.c
+++ b/drivers/input/touchscreen/cyttsp_core.c
@@ -494,34 +494,30 @@ static int cyttsp_disable(struct cyttsp *ts)
 static int cyttsp_suspend(struct device *dev)
 {
 	struct cyttsp *ts = dev_get_drvdata(dev);
-	int retval = 0;
+	int error;
 
-	mutex_lock(&ts->input->mutex);
+	guard(mutex)(&ts->input->mutex);
 
 	if (input_device_enabled(ts->input)) {
-		retval = cyttsp_disable(ts);
-		if (retval == 0)
-			ts->suspended = true;
+		error = cyttsp_disable(ts);
+		if (error)
+			return error;
 	}
 
-	mutex_unlock(&ts->input->mutex);
-
-	return retval;
+	ts->suspended = true;
+	return 0;
 }
 
 static int cyttsp_resume(struct device *dev)
 {
 	struct cyttsp *ts = dev_get_drvdata(dev);
 
-	mutex_lock(&ts->input->mutex);
+	guard(mutex)(&ts->input->mutex);
 
 	if (input_device_enabled(ts->input))
 		cyttsp_enable(ts);
 
 	ts->suspended = false;
-
-	mutex_unlock(&ts->input->mutex);
-
 	return 0;
 }