Input: imx6ul_tsc - use guard notation when acquiring mutex

Guard notation simplifies code.

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

diff --git a/drivers/input/touchscreen/imx6ul_tsc.c b/drivers/input/touchscreen/imx6ul_tsc.c
index 85f697de2b7e29a7698df59d044785a6a43033fb..43d6c69e308801afcb8a87a0fd857bba5f8af777 100644 (file)
--- a/drivers/input/touchscreen/imx6ul_tsc.c
+++ b/drivers/input/touchscreen/imx6ul_tsc.c
@@ -551,13 +551,11 @@ static int imx6ul_tsc_suspend(struct device *dev)
        struct imx6ul_tsc *tsc = platform_get_drvdata(pdev);
        struct input_dev *input_dev = tsc->input;
 
-       mutex_lock(&input_dev->mutex);
+       guard(mutex)(&input_dev->mutex);
 
        if (input_device_enabled(input_dev))
                imx6ul_tsc_stop(tsc);
 
-       mutex_unlock(&input_dev->mutex);
-
        return 0;
 }
 
@@ -566,16 +564,17 @@ static int imx6ul_tsc_resume(struct device *dev)
        struct platform_device *pdev = to_platform_device(dev);
        struct imx6ul_tsc *tsc = platform_get_drvdata(pdev);
        struct input_dev *input_dev = tsc->input;
-       int retval = 0;
-
-       mutex_lock(&input_dev->mutex);
+       int error;
 
-       if (input_device_enabled(input_dev))
-               retval = imx6ul_tsc_start(tsc);
+       guard(mutex)(&input_dev->mutex);
 
-       mutex_unlock(&input_dev->mutex);
+       if (input_device_enabled(input_dev)) {
+               error = imx6ul_tsc_start(tsc);
+               if (error)
+                       return error;
+       }
 
-       return retval;
+       return 0;
 }
 
 static DEFINE_SIMPLE_DEV_PM_OPS(imx6ul_tsc_pm_ops,