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

Input: ipaq-micro-ts - use guard notation when acquiring mutex/spinlock

Guard notation simplifies code.

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

diff --git a/drivers/input/touchscreen/ipaq-micro-ts.c b/drivers/input/touchscreen/ipaq-micro-ts.c
index 94720c41c9be..243e6465d9bd 100644
--- a/drivers/input/touchscreen/ipaq-micro-ts.c
+++ b/drivers/input/touchscreen/ipaq-micro-ts.c
@@ -47,7 +47,7 @@ static void micro_ts_toggle_receive(struct touchscreen_data *ts, bool enable)
 {
 	struct ipaq_micro *micro = ts->micro;
 
-	spin_lock_irq(&micro->lock);
+	guard(spinlock_irq)(&micro->lock);
 
 	if (enable) {
 		micro->ts = micro_ts_receive;
@@ -56,8 +56,6 @@ static void micro_ts_toggle_receive(struct touchscreen_data *ts, bool enable)
 		micro->ts = NULL;
 		micro->ts_data = NULL;
 	}
-
-	spin_unlock_irq(&ts->micro->lock);
 }
 
 static int micro_ts_open(struct input_dev *input)
@@ -133,13 +131,11 @@ static int micro_ts_resume(struct device *dev)
 	struct touchscreen_data *ts = dev_get_drvdata(dev);
 	struct input_dev *input = ts->input;
 
-	mutex_lock(&input->mutex);
+	guard(mutex)(&input->mutex);
 
 	if (input_device_enabled(input))
 		micro_ts_toggle_receive(ts, true);
 
-	mutex_unlock(&input->mutex);
-
 	return 0;
 }