]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
slimbus: qcom-ctrl: use 'time_left' variable with wait_for_completion_timeout()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 2 Sep 2024 14:10:02 +0000 (15:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 Sep 2024 10:10:38 +0000 (12:10 +0200)
There is a confusing pattern in the kernel to use a variable named 'timeout' to
store the result of wait_for_completion_timeout() causing patterns like:

timeout = wait_for_completion_timeout(...)
if (!timeout) return -ETIMEDOUT;

with all kinds of permutations. Use 'time_left' as a variable to make the code
self explaining.

Fix to the proper variable type 'unsigned long' while here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Bjorn Andersson <quic_bjorande@quicinc.com>
Link: https://lore.kernel.org/r/20240902141004.70048-3-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/slimbus/qcom-ctrl.c

index 0274bc285b6018e7cc1c6fe87e707835b638f01e..e25f9bdd9b2337428d7414d4228f806a7c2ed036 100644 (file)
@@ -330,7 +330,8 @@ static int qcom_xfer_msg(struct slim_controller *sctrl,
        void *pbuf = slim_alloc_txbuf(ctrl, txn, &done);
        unsigned long ms = txn->rl + HZ;
        u8 *puc;
-       int ret = 0, timeout, retries = QCOM_BUF_ALLOC_RETRIES;
+       int ret = 0, retries = QCOM_BUF_ALLOC_RETRIES;
+       unsigned long time_left;
        u8 la = txn->la;
        u32 *head;
        /* HW expects length field to be excluded */
@@ -374,9 +375,9 @@ static int qcom_xfer_msg(struct slim_controller *sctrl,
                memcpy(puc, txn->msg->wbuf, txn->msg->num_bytes);
 
        qcom_slim_queue_tx(ctrl, head, txn->rl, MGR_TX_MSG);
-       timeout = wait_for_completion_timeout(&done, msecs_to_jiffies(ms));
+       time_left = wait_for_completion_timeout(&done, msecs_to_jiffies(ms));
 
-       if (!timeout) {
+       if (!time_left) {
                dev_err(ctrl->dev, "TX timed out:MC:0x%x,mt:0x%x", txn->mc,
                                        txn->mt);
                ret = -ETIMEDOUT;