The patch titled
tpm: use wait_event return code and msecs_to_jiffies
has been removed from the -mm tree. Its filename is
tpm-driver-for-next-generation-tpm-chips-fix-fix.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Kylene Jo Hall <kjhall@xxxxxxxxxx>
Update the usage of wait_event calls to utilize the return code and
msecs_to_jiffies.
Signed-off-by: Kylie Hall <kjhall@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/tpm/tpm_tis.c | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff -puN drivers/char/tpm/tpm_tis.c~tpm-driver-for-next-generation-tpm-chips-fix-fix drivers/char/tpm/tpm_tis.c
--- 25/drivers/char/tpm/tpm_tis.c~tpm-driver-for-next-generation-tpm-chips-fix-fix Tue Apr 11 15:41:54 2006
+++ 25-akpm/drivers/char/tpm/tpm_tis.c Tue Apr 11 15:41:54 2006
@@ -87,6 +87,7 @@ static void release_locality(struct tpm_
static int request_locality(struct tpm_chip *chip, int l)
{
unsigned long stop;
+ long rc;
if (check_locality(chip, l) >= 0)
return l;
@@ -95,11 +96,14 @@ static int request_locality(struct tpm_c
chip->vendor.iobase + TPM_ACCESS(l));
if (chip->vendor.irq) {
- wait_event_interruptible_timeout(chip->vendor.int_queue,
- (check_locality(chip, l) >= 0),
- HZ * chip->vendor.timeout_a /
- 1000);
- if (check_locality(chip, l) >= 0)
+ rc = wait_event_interruptible_timeout(chip->vendor.
+ int_queue,
+ (check_locality
+ (chip, l) >= 0),
+ msecs_to_jiffies
+ (chip->vendor.
+ timeout_a));
+ if (rc > 0)
return l;
} else {
@@ -153,6 +157,7 @@ static int wait_for_stat(struct tpm_chip
wait_queue_head_t *queue)
{
unsigned long stop;
+ long rc;
u8 status;
/* check current status */
@@ -161,12 +166,13 @@ static int wait_for_stat(struct tpm_chip
return 0;
if (chip->vendor.irq) {
- wait_event_interruptible_timeout(*queue,
- ((tpm_tis_status(chip) &
- mask) == mask),
- HZ * timeout / 1000);
- status = tpm_tis_status(chip);
- if ((status & mask) == mask)
+ rc = wait_event_interruptible_timeout(*queue,
+ ((tpm_tis_status
+ (chip) & mask) ==
+ mask),
+ msecs_to_jiffies
+ (timeout));
+ if (rc > 0)
return 0;
} else {
stop = jiffies + (HZ * timeout / 1000);
_
Patches currently in -mm which might be from kjhall@xxxxxxxxxx are
tpm-fix-memory-leak.patch
tpm-fix-missing-string.patch
tpm-spacing-cleanups.patch
tpm-reorganize-sysfs-files.patch
tpm-chip-struct-update.patch
tpm-return-chip-from-tpm_register_hardware.patch
tpm-command-duration-update.patch
tpm-new-12-sysfs-files.patch
tpm-driver-for-next-generation-tpm-chips.patch
tpm-msecs_to_jiffies-cleanups.patch
tpm-use-clear_bit.patch
tpm-tpm_infineon-updated-to-latest-interface-changes.patch
tpm-check-mem-start-and-len.patch
tpm-update-bios-log-code-for-12.patch
tpm_infineon-section-fixup.patch
tpm-spacing-cleanups-2.patch
tpm-add-interrupt-module-parameter.patch
tpm-add-hid-module-paramater.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
