Input: edt-ft5x06 - move parameter restore into helper

We need to restore the parameters if we switch between the
factory/work mode and during the resume process if we switched off the
power-supply. Therefore refactor edt_ft5x06_work_mode() and move the
"restore the parameters" into a helper routine so we can reuse it later.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.kernel.org/r/20200227112819.16754-3-m.felsch@pengutronix.de
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 9b8450794a8a26735d698f119299e30e08013bc6..bb910709379620375c044764936b36558659acc8 100644 (file)
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -527,6 +527,29 @@ static const struct attribute_group edt_ft5x06_attr_group = {
        .attrs = edt_ft5x06_attrs,
 };
 
+static void edt_ft5x06_restore_reg_parameters(struct edt_ft5x06_ts_data *tsdata)
+{
+       struct edt_reg_addr *reg_addr = &tsdata->reg_addr;
+
+       edt_ft5x06_register_write(tsdata, reg_addr->reg_threshold,
+                                 tsdata->threshold);
+       edt_ft5x06_register_write(tsdata, reg_addr->reg_gain,
+                                 tsdata->gain);
+       if (reg_addr->reg_offset != NO_REGISTER)
+               edt_ft5x06_register_write(tsdata, reg_addr->reg_offset,
+                                         tsdata->offset);
+       if (reg_addr->reg_offset_x != NO_REGISTER)
+               edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_x,
+                                         tsdata->offset_x);
+       if (reg_addr->reg_offset_y != NO_REGISTER)
+               edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_y,
+                                         tsdata->offset_y);
+       if (reg_addr->reg_report_rate != NO_REGISTER)
+               edt_ft5x06_register_write(tsdata, reg_addr->reg_report_rate,
+                                 tsdata->report_rate);
+
+}
+
 #ifdef CONFIG_DEBUG_FS
 static int edt_ft5x06_factory_mode(struct edt_ft5x06_ts_data *tsdata)
 {
@@ -592,7 +615,6 @@ static int edt_ft5x06_work_mode(struct edt_ft5x06_ts_data *tsdata)
 {
        struct i2c_client *client = tsdata->client;
        int retries = EDT_SWITCH_MODE_RETRIES;
-       struct edt_reg_addr *reg_addr = &tsdata->reg_addr;
        int ret;
        int error;
 
@@ -624,24 +646,7 @@ static int edt_ft5x06_work_mode(struct edt_ft5x06_ts_data *tsdata)
        kfree(tsdata->raw_buffer);
        tsdata->raw_buffer = NULL;
 
-       /* restore parameters */
-       edt_ft5x06_register_write(tsdata, reg_addr->reg_threshold,
-                                 tsdata->threshold);
-       edt_ft5x06_register_write(tsdata, reg_addr->reg_gain,
-                                 tsdata->gain);
-       if (reg_addr->reg_offset != NO_REGISTER)
-               edt_ft5x06_register_write(tsdata, reg_addr->reg_offset,
-                                         tsdata->offset);
-       if (reg_addr->reg_offset_x != NO_REGISTER)
-               edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_x,
-                                         tsdata->offset_x);
-       if (reg_addr->reg_offset_y != NO_REGISTER)
-               edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_y,
-                                         tsdata->offset_y);
-       if (reg_addr->reg_report_rate != NO_REGISTER)
-               edt_ft5x06_register_write(tsdata, reg_addr->reg_report_rate,
-                                 tsdata->report_rate);
-
+       edt_ft5x06_restore_reg_parameters(tsdata);
        enable_irq(client->irq);
 
        return 0;