summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-01-13 23:13:11 +0100
committerPeter Huewe <peterhuewe@gmx.de>2015-01-17 15:04:03 +0100
commit7b1ee96f074cc931a2c226b33607fe7a74d5cba3 (patch)
treeb6f6f1dbdabebd46f40b2944a512526898aab631
parentfc9ad777c3ebbeaf423f75e0d8b04db42b3c9ebf (diff)
downloadlinux-7b1ee96f074cc931a2c226b33607fe7a74d5cba3.tar.bz2
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>
-rw-r--r--drivers/char/tpm/tpm_i2c_stm_st33.c8
1 files 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 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;
}