Input: sx8654 - use guard notation when acquiring spinlock

Guard notation simplifies code.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c
index 5fa47a1a6fdce42c193b3696ca4848b7263bb7e1..b5fe750e42ad27d8325dcaa25d95d78e1e49990e 100644 (file)
--- a/drivers/input/touchscreen/sx8654.c
+++ b/drivers/input/touchscreen/sx8654.c
@@ -117,12 +117,11 @@ static inline void sx865x_penrelease(struct sx8654 *ts)
 static void sx865x_penrelease_timer_handler(struct timer_list *t)
 {
        struct sx8654 *ts = timer_container_of(ts, t, timer);
-       unsigned long flags;
 
-       spin_lock_irqsave(&ts->lock, flags);
-       sx865x_penrelease(ts);
-       spin_unlock_irqrestore(&ts->lock, flags);
        dev_dbg(&ts->client->dev, "penrelease by timer\n");
+
+       guard(spinlock_irqsave)(&ts->lock);
+       sx865x_penrelease(ts);
 }
 
 static irqreturn_t sx8650_irq(int irq, void *handle)
@@ -130,7 +129,6 @@ static irqreturn_t sx8650_irq(int irq, void *handle)
        struct sx8654 *ts = handle;
        struct device *dev = &ts->client->dev;
        int len, i;
-       unsigned long flags;
        u8 stat;
        u16 x, y;
        u16 ch;
@@ -153,7 +151,7 @@ static irqreturn_t sx8650_irq(int irq, void *handle)
                return IRQ_HANDLED;
        }
 
-       spin_lock_irqsave(&ts->lock, flags);
+       guard(spinlock_irqsave)(&ts->lock);
 
        x = 0;
        y = 0;
@@ -184,7 +182,6 @@ static irqreturn_t sx8650_irq(int irq, void *handle)
        dev_dbg(dev, "point(%4d,%4d)\n", x, y);
 
        mod_timer(&ts->timer, jiffies + SX8650_PENIRQ_TIMEOUT);
-       spin_unlock_irqrestore(&ts->lock, flags);
 
        return IRQ_HANDLED;
 }