summaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm.c
diff options
context:
space:
mode:
authorKylene Jo Hall <kjhall@us.ibm.com>2005-10-30 15:03:23 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:37:28 -0800
commitb4ed3e3cbb312869929cf4528d71e52629a6cacb (patch)
treed514dfb584eebf74f7d89d3cdd57618e55aaaeca /drivers/char/tpm/tpm.c
parent162a88f7b8539a097a088c0321ea1997cacccaea (diff)
downloadkernel-crypto-b4ed3e3cbb312869929cf4528d71e52629a6cacb.tar.gz
kernel-crypto-b4ed3e3cbb312869929cf4528d71e52629a6cacb.tar.xz
kernel-crypto-b4ed3e3cbb312869929cf4528d71e52629a6cacb.zip
[PATCH] tpm: add status function to allow non-lpc bus chips
This patch is in preparation of supporting chips that are not necessarily on the lpc bus and thus are not accessed with inb's and outb's. The patch replaces the call to get the chip's status in the tpm.c file with a vendor specific status function. The patch also defines the function for each of the current supported devices. Signed-off-by: Kylene 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.c')
-rw-r--r--drivers/char/tpm/tpm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 049d128ae7f..328f2a97916 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -79,7 +79,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
stop = jiffies + 2 * 60 * HZ;
do {
- u8 status = inb(chip->vendor->base + 1);
+ u8 status = chip->vendor->status(chip);
if ((status & chip->vendor->req_complete_mask) ==
chip->vendor->req_complete_val) {
goto out_recv;