Input: mt - convert locking to guard notation
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 7 Nov 2024 07:15:32 +0000 (23:15 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 24 Dec 2024 06:53:57 +0000 (22:53 -0800)
Use guard() notation instead of explicitly acquiring and releasing
spinlocks to simplify the code and ensure that all locks are released.

Link: https://lore.kernel.org/r/20241107071538.195340-6-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/input-mt.c

index 6b04a674f832a048a3e021f92517d8529d27f652..45e41fc9059cad0e08f7fe1c5f5c02641fa66e59 100644 (file)
@@ -285,14 +285,10 @@ void input_mt_drop_unused(struct input_dev *dev)
        struct input_mt *mt = dev->mt;
 
        if (mt) {
-               unsigned long flags;
-
-               spin_lock_irqsave(&dev->event_lock, flags);
+               guard(spinlock_irqsave)(&dev->event_lock);
 
                __input_mt_drop_unused(dev, mt);
                mt->frame++;
-
-               spin_unlock_irqrestore(&dev->event_lock, flags);
        }
 }
 EXPORT_SYMBOL(input_mt_drop_unused);
@@ -339,11 +335,8 @@ void input_mt_sync_frame(struct input_dev *dev)
                return;
 
        if (mt->flags & INPUT_MT_DROP_UNUSED) {
-               unsigned long flags;
-
-               spin_lock_irqsave(&dev->event_lock, flags);
+               guard(spinlock_irqsave)(&dev->event_lock);
                __input_mt_drop_unused(dev, mt);
-               spin_unlock_irqrestore(&dev->event_lock, flags);
        }
 
        if ((mt->flags & INPUT_MT_POINTER) && !(mt->flags & INPUT_MT_SEMI_MT))