Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 07 Jun 2022 07:43:04 +0000
To:     linux-kernel@vger.kernel.org
From:   "Lin, Meng-Bo" <linmengbo0689@protonmail.com>
Cc:     dmitry.torokhov@gmail.com, mcoquelin.stm32@gmail.com,
        alexandre.torgue@foss.st.com, rydberg@bitmath.org,
        zhengyongjun3@huawei.com, linux-input@vger.kernel.org,
        linux-stm32@st-md-mailman.stormreply.com,
        linux-arm-kernel@lists.infradead.org,
        ~postmarketos/upstreaming@lists.sr.ht, andi@etezian.org,
        stephan@gerhold.net, nikita@trvn.ru
Reply-To: "Lin, Meng-Bo" <linmengbo0689@protonmail.com>
Subject: [RESEND PATCH] input: stmfts: Add #define STMFTS_RETRY_COUNT 3
Message-ID: <20220607074249.21763-1-linmengbo0689@protonmail.com>
Feedback-ID: 40467236:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Add #define STMFTS_RETRY_COUNT 3 to retry stmfts_command() 3 times.
Without it, STMFTS_SYSTEM_RESET or STMFTS_SLEEP_OUT may return -ETIMEDOUT
to failed attempt due to no event received for the completion.

Signed-off-by: Lin, Meng-Bo <linmengbo0689@protonmail.com>
---
 drivers/input/touchscreen/stmfts.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen=
/stmfts.c
index c175d44c52f3..730035f5c62c 100644
--- a/drivers/input/touchscreen/stmfts.c
+++ b/drivers/input/touchscreen/stmfts.c
@@ -68,6 +68,7 @@
 #define STMFTS_DATA_MAX_SIZE=09(STMFTS_EVENT_SIZE * STMFTS_STACK_DEPTH)
 #define STMFTS_MAX_FINGERS=0910
 #define STMFTS_DEV_NAME=09=09"stmfts"
+#define STMFTS_RETRY_COUNT=093
=20
 enum stmfts_regulators {
 =09STMFTS_REGULATOR_VDD,
@@ -317,19 +318,20 @@ static irqreturn_t stmfts_irq_handler(int irq, void *=
dev)
=20
 static int stmfts_command(struct stmfts_data *sdata, const u8 cmd)
 {
-=09int err;
+=09int err, retry;
=20
 =09reinit_completion(&sdata->cmd_done);
=20
-=09err =3D i2c_smbus_write_byte(sdata->client, cmd);
-=09if (err)
-=09=09return err;
-
-=09if (!wait_for_completion_timeout(&sdata->cmd_done,
-=09=09=09=09=09 msecs_to_jiffies(1000)))
-=09=09return -ETIMEDOUT;
+=09for (retry =3D 0; retry < STMFTS_RETRY_COUNT; retry++) {
+=09=09err =3D i2c_smbus_write_byte(sdata->client, cmd);
+=09=09if (err)
+=09=09=09return err;
=20
-=09return 0;
+=09=09if (wait_for_completion_timeout(&sdata->cmd_done,
+=09=09=09=09=09=09msecs_to_jiffies(1000)))
+=09=09=09return 0;
+=09}
+=09return -ETIMEDOUT;
 }
=20
 static int stmfts_input_open(struct input_dev *dev)
--=20
2.30.2