aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm.h
diff options
context:
space:
mode:
authorKylene Jo Hall <kjhall@us.ibm.com>2006-04-22 05:38:19 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-22 12:19:54 -0400
commit36b20020e537036c4f9eb5b69140c88ead5da7dc (patch)
tree71a83d0da45630fe3c3a69c446823716164fbcc1 /drivers/char/tpm/tpm.h
parent27084efee0c3dc0eb15b5ed750aa9f1adb3983c3 (diff)
[PATCH] tpm: msecs_to_jiffies cleanups
The timeout and duration values used in the tpm driver are not exposed to userspace. This patch converts the storage units to jiffies with msecs_to_jiffies. They were always being used in jiffies so this simplifies things removing the need for calculation all over the place. The change necessitated a type change in the tpm_chip struct to hold jiffies. Signed-off-by: Kylie Hall <kjhall@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/tpm/tpm.h')
-rw-r--r--drivers/char/tpm/tpm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 24541a556d02..54a4c804e25f 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -77,8 +77,8 @@ struct tpm_vendor_specific {
77 struct attribute_group *attr_group; 77 struct attribute_group *attr_group;
78 struct list_head list; 78 struct list_head list;
79 int locality; 79 int locality;
80 u32 timeout_a, timeout_b, timeout_c, timeout_d; 80 unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */
81 u32 duration[3]; 81 unsigned long duration[3]; /* jiffies */
82 82
83 wait_queue_head_t read_queue; 83 wait_queue_head_t read_queue;
84 wait_queue_head_t int_queue; 84 wait_queue_head_t int_queue;