Skip to content

Commit cec6b33

Browse files
committed
Input: ff-memless - convert locking to guard notation
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-4-dmitry.torokhov@gmail.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 19c8d0e commit cec6b33

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

drivers/input/ff-memless.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -401,13 +401,11 @@ static void ml_effect_timer(struct timer_list *t)
401401
{
402402
struct ml_device *ml = from_timer(ml, t, timer);
403403
struct input_dev *dev = ml->dev;
404-
unsigned long flags;
405404

406405
pr_debug("timer: updating effects\n");
407406

408-
spin_lock_irqsave(&dev->event_lock, flags);
407+
guard(spinlock_irqsave)(&dev->event_lock);
409408
ml_play_effects(ml);
410-
spin_unlock_irqrestore(&dev->event_lock, flags);
411409
}
412410

413411
/*
@@ -465,7 +463,7 @@ static int ml_ff_upload(struct input_dev *dev,
465463
struct ml_device *ml = dev->ff->private;
466464
struct ml_effect_state *state = &ml->states[effect->id];
467465

468-
spin_lock_irq(&dev->event_lock);
466+
guard(spinlock_irq)(&dev->event_lock);
469467

470468
if (test_bit(FF_EFFECT_STARTED, &state->flags)) {
471469
__clear_bit(FF_EFFECT_PLAYING, &state->flags);
@@ -477,8 +475,6 @@ static int ml_ff_upload(struct input_dev *dev,
477475
ml_schedule_timer(ml);
478476
}
479477

480-
spin_unlock_irq(&dev->event_lock);
481-
482478
return 0;
483479
}
484480

0 commit comments

Comments
 (0)