Input: imx6ul_tsc - unify open/close and PM paths
Subsystems (3)
Dmitry Torokhov
maintainerPATCH 1/1 Input: imx6ul_tsc - unify open/close and PM paths
Open/close and resume/suspend paths are very similar, let's factor out common parts.
Signed-off-by Dmitry Torokhov <[email protected]>
--- drivers/input/touchscreen/imx6ul_tsc.c | 52 +++++++++++--------------- 1 file changed, 22 insertions(+), 30 deletions(-)
drivers/input/touchscreen/imx6ul_tsc.c +22 -30
@@ -315,9 +315,8 @@ static irqreturn_t adc_irq_fn(int irq, void *dev_id)return IRQ_HANDLED ; } -static int imx6ul_tsc_open (struct input_dev *input_dev) +static int imx6ul_tsc_start (struct imx6ul_tsc *tsc) { -struct imx6ul_tsc *tsc =input_get_drvdata (input_dev);int err; err =clk_prepare_enable (tsc->adc_clk);
@@ -349,16 +348,29 @@ static int imx6ul_tsc_open(struct input_dev *input_dev)return err; } -static void imx6ul_tsc_close (struct input_dev *input_dev) +static void imx6ul_tsc_stop (struct imx6ul_tsc *tsc) { -struct imx6ul_tsc *tsc =input_get_drvdata (input_dev); -imx6ul_tsc_disable (tsc);clk_disable_unprepare (tsc->tsc_clk);clk_disable_unprepare (tsc->adc_clk); } + +static int imx6ul_tsc_open (struct input_dev *input_dev) +{ +struct imx6ul_tsc *tsc =input_get_drvdata (input_dev); + +return imx6ul_tsc_start (tsc); +} + +static void imx6ul_tsc_close (struct input_dev *input_dev) +{ +struct imx6ul_tsc *tsc =input_get_drvdata (input_dev); + +imx6ul_tsc_stop (tsc); +} +static int imx6ul_tsc_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;
@@ -509,12 +521,8 @@ static int __maybe_unused imx6ul_tsc_suspend(struct device *dev)mutex_lock (&input_dev->mutex); -if (input_dev->users) { -imx6ul_tsc_disable (tsc); - -clk_disable_unprepare (tsc->tsc_clk); -clk_disable_unprepare (tsc->adc_clk); - } +if (input_dev->users) +imx6ul_tsc_stop (tsc);mutex_unlock (&input_dev->mutex);
@@ -530,27 +538,11 @@ static int __maybe_unused imx6ul_tsc_resume(struct device *dev)mutex_lock (&input_dev->mutex); -if (!input_dev->users) - goto out; - - retval =clk_prepare_enable (tsc->adc_clk); -if (retval) - goto out; - - retval =clk_prepare_enable (tsc->tsc_clk); -if (retval) { -clk_disable_unprepare (tsc->adc_clk); - goto out; - } +if (input_dev->users) + retval =imx6ul_tsc_start (tsc); - retval =imx6ul_tsc_init (tsc); -if (retval) { -clk_disable_unprepare (tsc->tsc_clk); -clk_disable_unprepare (tsc->adc_clk); - goto out; - } -out:mutex_unlock (&input_dev->mutex); +return retval; }
Signature · 5 lines
2.28.0.618.gf4bc123cb7-goog -- Dmitry
Quoted 4 lines · Dmitry Torokhov
Open/close and resume/suspend paths are very similar, let's factor out common parts.
Signed-off-by Dmitry Torokhov <[email protected]>
Acked-by Shawn Guo <[email protected]>