[PATCH] char/tpm: use msleep(), clean-up timers,
The TPM driver unnecessarily uses timers when it simply needs to maintain a maximum delay via time_before(). msleep() is used instead of schedule_timeout() to guarantee the task delays as expected. While compile-testing, I found a typo in the driver, using tpm_chp instead of tpm_chip. Remove the now unused timer callback function and change TPM_TIMEOUT's units to milliseconds. Patch is compile-tested. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Acked-by: Kylene Hall <kjhall@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
6a94f92097
commit
700d8bdcd0
@ -25,7 +25,7 @@
|
||||
#include <linux/fs.h>
|
||||
#include <linux/miscdevice.h>
|
||||
|
||||
#define TPM_TIMEOUT msecs_to_jiffies(5)
|
||||
#define TPM_TIMEOUT 5 /* msecs */
|
||||
|
||||
/* TPM addresses */
|
||||
#define TPM_ADDR 0x4E
|
||||
@ -78,7 +78,6 @@ static inline void tpm_write_index(int index, int value)
|
||||
outb(value & 0xFF, TPM_DATA);
|
||||
}
|
||||
|
||||
extern void tpm_time_expired(unsigned long);
|
||||
extern int tpm_lpc_bus_init(struct pci_dev *, u16);
|
||||
|
||||
extern int tpm_register_hardware(struct pci_dev *,
|
||||
|
Reference in New Issue
Block a user