Input: omap4-keypad - use guard notation when acquiring mutex
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 25 Aug 2024 05:16:16 +0000 (22:16 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 3 Oct 2024 15:58:57 +0000 (08:58 -0700)
This 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/20240825051627.2848495-13-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/omap4-keypad.c

index 040b340..935c2b2 100644 (file)
@@ -144,7 +144,7 @@ static void omap4_keypad_scan_keys(struct omap4_keypad *keypad_data, u64 keys)
 {
        u64 changed;
 
-       mutex_lock(&keypad_data->lock);
+       guard(mutex)(&keypad_data->lock);
 
        changed = keys ^ keypad_data->keys;
 
@@ -158,8 +158,6 @@ static void omap4_keypad_scan_keys(struct omap4_keypad *keypad_data, u64 keys)
        omap4_keypad_report_keys(keypad_data, changed & keys, true);
 
        keypad_data->keys = keys;
-
-       mutex_unlock(&keypad_data->lock);
 }
 
 /* Interrupt handlers */