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

Input: imx6ul_tsc - use guard notation when acquiring mutex

Guard notation simplifies code.

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

diff --git a/drivers/input/touchscreen/imx6ul_tsc.c b/drivers/input/touchscreen/imx6ul_tsc.c
index 85f697de2b7e..43d6c69e3088 100644
--- a/drivers/input/touchscreen/imx6ul_tsc.c
+++ b/drivers/input/touchscreen/imx6ul_tsc.c
@@ -551,13 +551,11 @@ static int imx6ul_tsc_suspend(struct device *dev)
 	struct imx6ul_tsc *tsc = platform_get_drvdata(pdev);
 	struct input_dev *input_dev = tsc->input;
 
-	mutex_lock(&input_dev->mutex);
+	guard(mutex)(&input_dev->mutex);
 
 	if (input_device_enabled(input_dev))
 		imx6ul_tsc_stop(tsc);
 
-	mutex_unlock(&input_dev->mutex);
-
 	return 0;
 }
 
@@ -566,16 +564,17 @@ static int imx6ul_tsc_resume(struct device *dev)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct imx6ul_tsc *tsc = platform_get_drvdata(pdev);
 	struct input_dev *input_dev = tsc->input;
-	int retval = 0;
-
-	mutex_lock(&input_dev->mutex);
+	int error;
 
-	if (input_device_enabled(input_dev))
-		retval = imx6ul_tsc_start(tsc);
+	guard(mutex)(&input_dev->mutex);
 
-	mutex_unlock(&input_dev->mutex);
+	if (input_device_enabled(input_dev)) {
+		error = imx6ul_tsc_start(tsc);
+		if (error)
+			return error;
+	}
 
-	return retval;
+	return 0;
 }
 
 static DEFINE_SIMPLE_DEV_PM_OPS(imx6ul_tsc_pm_ops,