[PATCH] tpm_tis_core: Use common error handling code in tpm_tis_send_data()

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sun, 22 Oct 2017 11:41:09 +0200

Add a jump target so that a specific error code assignment for timeout
conditions will be in the implementation only at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/char/tpm/tpm_tis_core.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index fdde971bc810..3681f7a74d1b 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -262,12 +262,10 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const 
u8 *buf, size_t len)
        status = tpm_tis_status(chip);
        if ((status & TPM_STS_COMMAND_READY) == 0) {
                tpm_tis_ready(chip);
-               if (wait_for_tpm_stat
-                   (chip, TPM_STS_COMMAND_READY, chip->timeout_b,
-                    &priv->int_queue, false) < 0) {
-                       rc = -ETIME;
-                       goto out_err;
-               }
+               if (wait_for_tpm_stat(chip, TPM_STS_COMMAND_READY,
+                                     chip->timeout_b, &priv->int_queue, false)
+                   < 0)
+                       goto report_timeout;
        }
 
        while (count < len - 1) {
@@ -286,10 +284,9 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const 
u8 *buf, size_t len)
                count += burstcnt;
 
                if (wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c,
-                                       &priv->int_queue, false) < 0) {
-                       rc = -ETIME;
-                       goto out_err;
-               }
+                                     &priv->int_queue, false) < 0)
+                       goto report_timeout;
+
                status = tpm_tis_status(chip);
                if (!itpm && (status & TPM_STS_DATA_EXPECT) == 0) {
                        rc = -EIO;
@@ -303,10 +300,9 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const 
u8 *buf, size_t len)
                goto out_err;
 
        if (wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c,
-                               &priv->int_queue, false) < 0) {
-               rc = -ETIME;
-               goto out_err;
-       }
+                             &priv->int_queue, false) < 0)
+               goto report_timeout;
+
        status = tpm_tis_status(chip);
        if (!itpm && (status & TPM_STS_DATA_EXPECT) != 0) {
                rc = -EIO;
@@ -315,6 +311,8 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const 
u8 *buf, size_t len)
 
        return 0;
 
+report_timeout:
+       rc = -ETIME;
 out_err:
        tpm_tis_ready(chip);
        return rc;
-- 
2.14.2