[PATCH 05/24] Input: synaptics - use guard notation when pausing serio port

[Dmitry Torokhov]

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.

Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
---
 drivers/input/mouse/synaptics.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 380aa1614442..2735f86c23cc 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -650,9 +650,8 @@ static int synaptics_pt_start(struct serio *serio)
        struct psmouse *parent = psmouse_from_serio(serio->parent);
        struct synaptics_data *priv = parent->private;
 
-       serio_pause_rx(parent->ps2dev.serio);
+       guard(serio_pause_rx)(parent->ps2dev.serio);
        priv->pt_port = serio;
-       serio_continue_rx(parent->ps2dev.serio);
 
        return 0;
 }
@@ -662,9 +661,8 @@ static void synaptics_pt_stop(struct serio *serio)
        struct psmouse *parent = psmouse_from_serio(serio->parent);
        struct synaptics_data *priv = parent->private;
 
-       serio_pause_rx(parent->ps2dev.serio);
+       guard(serio_pause_rx)(parent->ps2dev.serio);
        priv->pt_port = NULL;
-       serio_continue_rx(parent->ps2dev.serio);
 }
 
 static int synaptics_is_pt_packet(u8 *buf)
-- 
2.46.0.469.g59c65b2a67-goog