[PATCH] tpm: use wait_event return code and msecs_to_jiffies

[Kylene Jo Hall <kjhall@us.ibm.com>]

On Tue, 2006-04-11 at 13:31 -0700, Nish Aravamudan wrote:
> Rather than check the condition you slept on right away, couldn't you
> just store the return value of wait_event_interruptible_timeout()? If
> it's positive, the condition should be true, if it's negative, then
> you got a signal, if it's 0, then you timed out. Same would go for the
> other change.

On Tue, 2006-04-11 at 22:40 +0200, Ingo Oeser wrote:
> what about using msecs_to_jiffies(chip->vendor.timeout_a) for this?

Great ideas, patch included below.

Update the usage of wait_event calls to utilize the return code and
msecs_to_jiffies.

Signed-off-by: Kylie Hall <kjhall@us.ibm.com>
---
 drivers/char/tpm/tpm_tis.c |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

--- linux-2.6.17-rc1-mm2/drivers/char/tpm/tpm_tis.c	2006-04-11 17:36:08.247422750 -0500
+++ linux-2.6.17-rc1/drivers/char/tpm/tpm_tis.c	2006-04-11 17:26:24.134918000 -0500
@@ -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);