Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9efa54f0 authored by Rajiv Andrade's avatar Rajiv Andrade
Browse files

TPM: Use vendor specific function for status probe 



Moved from using tpm_tis_status() to the vendor specific
one in wait_for_stat(). This way other TPM drivers can use it
instead of reimplementing another.

Signed-off-by: default avatarRajiv Andrade <srajiv@linux.vnet.ibm.com>
parent a927b813

drivers/char/tpm/tpm_tis.c

+5 −5
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, 
	u8 status;



	/* check current status */

	status = tpm_tis_status(chip);

	status = chip->vendor.status(chip);

	if ((status & mask) == mask)

		return 0;
@@ -213,9 +213,9 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, 
		if ((long)timeout <= 0)

			return -ETIME;

		rc = wait_event_interruptible_timeout(*queue,

						      ((tpm_tis_status

							(chip) & mask) ==

						       mask), timeout);

						      ((chip->vendor.status(chip)

						      & mask) == mask),

						      timeout);

		if (rc > 0)

			return 0;

		if (rc == -ERESTARTSYS && freezing(current)) {
@@ -225,7 +225,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, 
	} else {

		do {

			msleep(TPM_TIMEOUT);

			status = tpm_tis_status(chip);

			status = chip->vendor.status(chip);

			if ((status & mask) == mask)

				return 0;

		} while (time_before(jiffies, stop));