Input: spear-keyboard - use guard notation when acquiring mutex

This makes the code more compact and error handling more robust
by ensuring that mutexes are released in all code paths when control
leaves critical section.

Link: https://lore.kernel.org/r/20240825051627.2848495-16-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index 1df4feb8ba01787a2bcc7046ae27a3a99e37f276..2d3f656e59dc5b0f3387619fdf461bc3aa00e45c 100644 (file)
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c
@@ -274,7 +274,7 @@ static int spear_kbd_suspend(struct device *dev)
        struct input_dev *input_dev = kbd->input;
        unsigned int rate = 0, mode_ctl_reg, val;
 
-       mutex_lock(&input_dev->mutex);
+       guard(mutex)(&input_dev->mutex);
 
        /* explicitly enable clock as we may program device */
        clk_enable(kbd->clk);
@@ -315,8 +315,6 @@ static int spear_kbd_suspend(struct device *dev)
        /* restore previous clk state */
        clk_disable(kbd->clk);
 
-       mutex_unlock(&input_dev->mutex);
-
        return 0;
 }
 
@@ -326,7 +324,7 @@ static int spear_kbd_resume(struct device *dev)
        struct spear_kbd *kbd = platform_get_drvdata(pdev);
        struct input_dev *input_dev = kbd->input;
 
-       mutex_lock(&input_dev->mutex);
+       guard(mutex)(&input_dev->mutex);
 
        if (device_may_wakeup(&pdev->dev)) {
                if (kbd->irq_wake_enabled) {
@@ -342,8 +340,6 @@ static int spear_kbd_resume(struct device *dev)
        if (input_device_enabled(input_dev))
                writel_relaxed(kbd->mode_ctl_reg, kbd->io_base + MODE_CTL_REG);
 
-       mutex_unlock(&input_dev->mutex);
-
        return 0;
 }