diff options
author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2013-09-23 14:14:33 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-09-24 16:14:55 -0400 |
commit | 56be88954bdb3d77619a786bf301af01efb2b057 (patch) | |
tree | c8296347197f7f5d6c493fec71d600b26a540ccc /drivers/char/tpm/xen-tpmfront.c | |
parent | 6a6f6e72eca5ed999689c69d1ac411fe319844a0 (diff) |
tpm: xen-tpmfront: Fix default durations
All the default durations were being set to 10 minutes which is
way too long for the timeouts. Normal values for the longest
duration are around 5 mins, and short duration ar around .5s.
Further, these are just the default, tpm_get_timeouts will set
them to values from the TPM (or throw an error).
Just remove them.
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/char/tpm/xen-tpmfront.c')
-rw-r--r-- | drivers/char/tpm/xen-tpmfront.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c index 7a7929ba2658..6f2fe2b0ae56 100644 --- a/drivers/char/tpm/xen-tpmfront.c +++ b/drivers/char/tpm/xen-tpmfront.c | |||
@@ -210,8 +210,6 @@ static struct attribute_group vtpm_attr_grp = { | |||
210 | .attrs = vtpm_attrs, | 210 | .attrs = vtpm_attrs, |
211 | }; | 211 | }; |
212 | 212 | ||
213 | #define TPM_LONG_TIMEOUT (10 * 60 * HZ) | ||
214 | |||
215 | static const struct tpm_vendor_specific tpm_vtpm = { | 213 | static const struct tpm_vendor_specific tpm_vtpm = { |
216 | .status = vtpm_status, | 214 | .status = vtpm_status, |
217 | .recv = vtpm_recv, | 215 | .recv = vtpm_recv, |
@@ -224,11 +222,6 @@ static const struct tpm_vendor_specific tpm_vtpm = { | |||
224 | .miscdev = { | 222 | .miscdev = { |
225 | .fops = &vtpm_ops, | 223 | .fops = &vtpm_ops, |
226 | }, | 224 | }, |
227 | .duration = { | ||
228 | TPM_LONG_TIMEOUT, | ||
229 | TPM_LONG_TIMEOUT, | ||
230 | TPM_LONG_TIMEOUT, | ||
231 | }, | ||
232 | }; | 225 | }; |
233 | 226 | ||
234 | static irqreturn_t tpmif_interrupt(int dummy, void *dev_id) | 227 | static irqreturn_t tpmif_interrupt(int dummy, void *dev_id) |