[PATCH 17/24] Input: sa1111ps2 - use guard notation when acquiring spinlock

[Dmitry Torokhov]

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.

Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
---
 drivers/input/serio/sa1111ps2.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 1311caf7dba4..375c6f5f905c 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -92,7 +92,8 @@ static irqreturn_t ps2_txint(int irq, void *dev_id)
        struct ps2if *ps2if = dev_id;
        unsigned int status;
 
-       spin_lock(&ps2if->lock);
+       guard(spinlock)(&ps2if->lock);
+
        status = readl_relaxed(ps2if->base + PS2STAT);
        if (ps2if->head == ps2if->tail) {
                disable_irq_nosync(irq);
@@ -101,7 +102,6 @@ static irqreturn_t ps2_txint(int irq, void *dev_id)
                writel_relaxed(ps2if->buf[ps2if->tail], ps2if->base + PS2DATA);
                ps2if->tail = (ps2if->tail + 1) & (sizeof(ps2if->buf) - 1);
        }
-       spin_unlock(&ps2if->lock);
 
        return IRQ_HANDLED;
 }
@@ -113,10 +113,9 @@ static irqreturn_t ps2_txint(int irq, void *dev_id)
 static int ps2_write(struct serio *io, unsigned char val)
 {
        struct ps2if *ps2if = io->port_data;
-       unsigned long flags;
        unsigned int head;
 
-       spin_lock_irqsave(&ps2if->lock, flags);
+       guard(spinlock_irqsave)(&ps2if->lock);
 
        /*
         * If the TX register is empty, we can go straight out.
@@ -133,7 +132,6 @@ static int ps2_write(struct serio *io, unsigned char val)
                }
        }
 
-       spin_unlock_irqrestore(&ps2if->lock, flags);
        return 0;
 }
 
-- 
2.46.0.469.g59c65b2a67-goog