Input: alps - use guard notation when pausing serio port
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 5 Sep 2024 04:17:08 +0000 (21:17 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 4 Oct 2024 07:58:15 +0000 (00:58 -0700)
Using guard notation makes the code more compact and error handling
more robust by ensuring that serio ports are resumed in all code paths
when control leaves critical section.

Acked-by: Pali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20240905041732.2034348-4-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/alps.c

index 4e37fc3..0728b5c 100644 (file)
@@ -1585,7 +1585,7 @@ static void alps_flush_packet(struct timer_list *t)
        struct alps_data *priv = from_timer(priv, t, timer);
        struct psmouse *psmouse = priv->psmouse;
 
-       serio_pause_rx(psmouse->ps2dev.serio);
+       guard(serio_pause_rx)(psmouse->ps2dev.serio);
 
        if (psmouse->pktcnt == psmouse->pktsize) {
 
@@ -1605,8 +1605,6 @@ static void alps_flush_packet(struct timer_list *t)
                }
                psmouse->pktcnt = 0;
        }
-
-       serio_continue_rx(psmouse->ps2dev.serio);
 }
 
 static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)