Commit 229ba714 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: locomokbd - use guard notation when acquiring spinlock 

Using guard notation 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/Zxr4AMJrzhZlHAlf@google.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent dda8fdb0

drivers/input/keyboard/locomokbd.c

+1 −4
Original line number Diff line number Diff line
@@ -112,11 +112,10 @@ static inline void locomokbd_reset_col(unsigned long membase, int col) 
static void locomokbd_scankeyboard(struct locomokbd *locomokbd)

{

	unsigned int row, col, rowd;

	unsigned long flags;

	unsigned int num_pressed;

	unsigned long membase = locomokbd->base;



	spin_lock_irqsave(&locomokbd->lock, flags);

	guard(spinlock_irqsave)(&locomokbd->lock);



	locomokbd_charge_all(membase);
@@ -167,8 +166,6 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd) 
		mod_timer(&locomokbd->timer, jiffies + SCAN_INTERVAL);

	else

		locomokbd->count_cancel = 0;



	spin_unlock_irqrestore(&locomokbd->lock, flags);

}



/*