diff options
Diffstat (limited to 'drivers/char/tpm/tpm-interface.c')
-rw-r--r-- | drivers/char/tpm/tpm-interface.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index fe597e6c55c4..1d6729be4cd6 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c | |||
@@ -455,7 +455,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, | |||
455 | goto out; | 455 | goto out; |
456 | } | 456 | } |
457 | 457 | ||
458 | msleep(TPM_TIMEOUT); /* CHECK */ | 458 | tpm_msleep(TPM_TIMEOUT); |
459 | rmb(); | 459 | rmb(); |
460 | } while (time_before(jiffies, stop)); | 460 | } while (time_before(jiffies, stop)); |
461 | 461 | ||
@@ -970,7 +970,7 @@ int tpm_do_selftest(struct tpm_chip *chip) | |||
970 | dev_info( | 970 | dev_info( |
971 | &chip->dev, HW_ERR | 971 | &chip->dev, HW_ERR |
972 | "TPM command timed out during continue self test"); | 972 | "TPM command timed out during continue self test"); |
973 | msleep(delay_msec); | 973 | tpm_msleep(delay_msec); |
974 | continue; | 974 | continue; |
975 | } | 975 | } |
976 | 976 | ||
@@ -985,7 +985,7 @@ int tpm_do_selftest(struct tpm_chip *chip) | |||
985 | } | 985 | } |
986 | if (rc != TPM_WARN_DOING_SELFTEST) | 986 | if (rc != TPM_WARN_DOING_SELFTEST) |
987 | return rc; | 987 | return rc; |
988 | msleep(delay_msec); | 988 | tpm_msleep(delay_msec); |
989 | } while (--loops > 0); | 989 | } while (--loops > 0); |
990 | 990 | ||
991 | return rc; | 991 | return rc; |
@@ -1085,7 +1085,7 @@ again: | |||
1085 | } | 1085 | } |
1086 | } else { | 1086 | } else { |
1087 | do { | 1087 | do { |
1088 | msleep(TPM_TIMEOUT); | 1088 | tpm_msleep(TPM_TIMEOUT); |
1089 | status = chip->ops->status(chip); | 1089 | status = chip->ops->status(chip); |
1090 | if ((status & mask) == mask) | 1090 | if ((status & mask) == mask) |
1091 | return 0; | 1091 | return 0; |
@@ -1150,7 +1150,7 @@ int tpm_pm_suspend(struct device *dev) | |||
1150 | */ | 1150 | */ |
1151 | if (rc != TPM_WARN_RETRY) | 1151 | if (rc != TPM_WARN_RETRY) |
1152 | break; | 1152 | break; |
1153 | msleep(TPM_TIMEOUT_RETRY); | 1153 | tpm_msleep(TPM_TIMEOUT_RETRY); |
1154 | } | 1154 | } |
1155 | 1155 | ||
1156 | if (rc) | 1156 | if (rc) |