[PATCH 03/10] Input: stmfts - abstract reading information from the firmware

[David Heidelberg via B4 Relay]

From: David Heidelberg <da...@ixit.cz>

Improves readability and makes splitting power on function in following
commit easier.
---
 drivers/input/touchscreen/stmfts.c | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/drivers/input/touchscreen/stmfts.c 
b/drivers/input/touchscreen/stmfts.c
index 7c0f94ba49464..db2dd0bb59fcc 100644
--- a/drivers/input/touchscreen/stmfts.c
+++ b/drivers/input/touchscreen/stmfts.c
@@ -519,22 +519,11 @@ static struct attribute *stmfts_sysfs_attrs[] = {
 };
 ATTRIBUTE_GROUPS(stmfts_sysfs);
 
-static int stmfts_power_on(struct stmfts_data *sdata)
+static int stmfts_read_system_info(struct stmfts_data *sdata)
 {
        int err;
        u8 reg[8];
 
-       err = regulator_bulk_enable(ARRAY_SIZE(stmfts_supplies),
-                                   sdata->supplies);
-       if (err)
-               return err;
-
-       /*
-        * The datasheet does not specify the power on time, but considering
-        * that the reset time is < 10ms, I sleep 20ms to be sure
-        */
-       msleep(20);
-
        err = i2c_smbus_read_i2c_block_data(sdata->client, STMFTS_READ_INFO,
                                            sizeof(reg), reg);
        if (err < 0)
@@ -548,6 +537,29 @@ static int stmfts_power_on(struct stmfts_data *sdata)
        sdata->config_id = reg[4];
        sdata->config_ver = reg[5];
 
+       return 0;
+}
+
+static int stmfts_power_on(struct stmfts_data *sdata)
+{
+       int err;
+
+       err = regulator_bulk_enable(ARRAY_SIZE(stmfts_supplies),
+                                   sdata->supplies);
+       if (err)
+               return err;
+
+       /*
+        * The datasheet does not specify the power on time, but considering
+        * that the reset time is < 10ms, I sleep 20ms to be sure
+        */
+       msleep(20);
+
+
+       err = stmfts_read_system_info(sdata);
+       if (err)
+               return err;
+
        enable_irq(sdata->client->irq);
 
        msleep(50);

-- 
2.51.0