From: Christophe Ricard <christophe.ricard@gmail.com>
Date: Tue, 13 Jan 2015 22:13:11 +0000 (+0100)
Subject: tpm/tpm_i2c_stm_st33: Replace remaining r by ret
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b1ee96f074cc931a2c226b33607fe7a74d5cba3;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

tpm/tpm_i2c_stm_st33: Replace remaining r by ret

Some places are still using r instead of ret.

Reviewed-by: Jason Gunthorpe <jason.gunthorpe@obsidianresearch.com>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---

diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index d6e87d73f949..86a24ced66c0 100644
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -374,7 +374,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
 			wait_queue_head_t *queue, bool check_cancel)
 {
 	unsigned long stop;
-	int r;
+	int ret;
 	bool canceled = false;
 	bool condition;
 	u32 cur_intrs;
@@ -400,7 +400,7 @@ again:
 		if ((long) timeout <= 0)
 			return -1;
 
-		r = wait_event_interruptible_timeout(*queue,
+		ret = wait_event_interruptible_timeout(*queue,
 					cur_intrs != tpm_dev->intrs, timeout);
 
 		interrupt |= clear_interruption(tpm_dev);
@@ -408,12 +408,12 @@ again:
 		condition = wait_for_tpm_stat_cond(chip, mask,
 						   check_cancel, &canceled);
 
-		if (r >= 0 && condition) {
+		if (ret >= 0 && condition) {
 			if (canceled)
 				return -ECANCELED;
 			return 0;
 		}
-		if (r == -ERESTARTSYS && freezing(current)) {
+		if (ret == -ERESTARTSYS && freezing(current)) {
 			clear_thread_flag(TIF_SIGPENDING);
 			goto again;
 		}