Input: ipaq-micro-keys - use guard notation when acquiring mutex and spinlock

This makes the code more compact and error handling more robust
by ensuring that locks are released in all code paths when control
leaves critical section.

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

diff --git a/drivers/input/keyboard/ipaq-micro-keys.c b/drivers/input/keyboard/ipaq-micro-keys.c
index 1d71dd79ffd289cb563271eb3c0547ade0dccdd0..58631bf7ce5564b29cdc69a41f9bef5d77aaee75 100644 (file)
--- a/drivers/input/keyboard/ipaq-micro-keys.c
+++ b/drivers/input/keyboard/ipaq-micro-keys.c
@@ -54,18 +54,18 @@ static void micro_key_receive(void *data, int len, unsigned char *msg)
 
 static void micro_key_start(struct ipaq_micro_keys *keys)
 {
-       spin_lock(&keys->micro->lock);
+       guard(spinlock)(&keys->micro->lock);
+
        keys->micro->key = micro_key_receive;
        keys->micro->key_data = keys;
-       spin_unlock(&keys->micro->lock);
 }
 
 static void micro_key_stop(struct ipaq_micro_keys *keys)
 {
-       spin_lock(&keys->micro->lock);
+       guard(spinlock)(&keys->micro->lock);
+
        keys->micro->key = NULL;
        keys->micro->key_data = NULL;
-       spin_unlock(&keys->micro->lock);
 }
 
 static int micro_key_open(struct input_dev *input)
@@ -141,13 +141,11 @@ static int micro_key_resume(struct device *dev)
        struct ipaq_micro_keys *keys = dev_get_drvdata(dev);
        struct input_dev *input = keys->input;
 
-       mutex_lock(&input->mutex);
+       guard(mutex)(&input->mutex);
 
        if (input_device_enabled(input))
                micro_key_start(keys);
 
-       mutex_unlock(&input->mutex);
-
        return 0;
 }