Some places are still using r instead of ret.
Reviewed-by: Jasob Gunthorpe <jason.gunthorpe@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Christophe Ricard <christophe-h.ricard@xxxxxx>
---
drivers/char/tpm/tpm_i2c_stm_st33.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index 2d6e50e..d12d507 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;
}
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
