diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-01-13 17:13:11 -0500 |
|---|---|---|
| committer | Peter Huewe <peterhuewe@gmx.de> | 2015-01-17 09:04:03 -0500 |
| commit | 7b1ee96f074cc931a2c226b33607fe7a74d5cba3 (patch) | |
| tree | b6f6f1dbdabebd46f40b2944a512526898aab631 /drivers/char/tpm | |
| parent | fc9ad777c3ebbeaf423f75e0d8b04db42b3c9ebf (diff) | |
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>
Diffstat (limited to 'drivers/char/tpm')
| -rw-r--r-- | drivers/char/tpm/tpm_i2c_stm_st33.c | 8 |
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, | |||
| 374 | wait_queue_head_t *queue, bool check_cancel) | 374 | wait_queue_head_t *queue, bool check_cancel) |
| 375 | { | 375 | { |
| 376 | unsigned long stop; | 376 | unsigned long stop; |
| 377 | int r; | 377 | int ret; |
| 378 | bool canceled = false; | 378 | bool canceled = false; |
| 379 | bool condition; | 379 | bool condition; |
| 380 | u32 cur_intrs; | 380 | u32 cur_intrs; |
| @@ -400,7 +400,7 @@ again: | |||
| 400 | if ((long) timeout <= 0) | 400 | if ((long) timeout <= 0) |
| 401 | return -1; | 401 | return -1; |
| 402 | 402 | ||
| 403 | r = wait_event_interruptible_timeout(*queue, | 403 | ret = wait_event_interruptible_timeout(*queue, |
| 404 | cur_intrs != tpm_dev->intrs, timeout); | 404 | cur_intrs != tpm_dev->intrs, timeout); |
| 405 | 405 | ||
| 406 | interrupt |= clear_interruption(tpm_dev); | 406 | interrupt |= clear_interruption(tpm_dev); |
| @@ -408,12 +408,12 @@ again: | |||
| 408 | condition = wait_for_tpm_stat_cond(chip, mask, | 408 | condition = wait_for_tpm_stat_cond(chip, mask, |
| 409 | check_cancel, &canceled); | 409 | check_cancel, &canceled); |
| 410 | 410 | ||
| 411 | if (r >= 0 && condition) { | 411 | if (ret >= 0 && condition) { |
| 412 | if (canceled) | 412 | if (canceled) |
| 413 | return -ECANCELED; | 413 | return -ECANCELED; |
| 414 | return 0; | 414 | return 0; |
| 415 | } | 415 | } |
| 416 | if (r == -ERESTARTSYS && freezing(current)) { | 416 | if (ret == -ERESTARTSYS && freezing(current)) { |
| 417 | clear_thread_flag(TIF_SIGPENDING); | 417 | clear_thread_flag(TIF_SIGPENDING); |
| 418 | goto again; | 418 | goto again; |
| 419 | } | 419 | } |
