Commit 1d191553 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen

tpm: remove tpm_read_index and tpm_write_index from tpm.h

These are non-generic functions and do not belong to tpm.h.
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
parent 20f482ab
...@@ -195,17 +195,6 @@ struct tpm_chip { ...@@ -195,17 +195,6 @@ struct tpm_chip {
#define to_tpm_chip(d) container_of(d, struct tpm_chip, dev) #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev)
static inline int tpm_read_index(int base, int index)
{
outb(index, base);
return inb(base+1) & 0xFF;
}
static inline void tpm_write_index(int base, int index, int value)
{
outb(index, base);
outb(value & 0xFF, base+1);
}
struct tpm_input_header { struct tpm_input_header {
__be16 tag; __be16 tag;
__be32 length; __be32 length;
......
...@@ -96,6 +96,12 @@ enum tpm_atmel_addr { ...@@ -96,6 +96,12 @@ enum tpm_atmel_addr {
TPM_ATMEL_BASE_ADDR_HI = 0x09 TPM_ATMEL_BASE_ADDR_HI = 0x09
}; };
static inline int tpm_read_index(int base, int index)
{
outb(index, base);
return inb(base+1) & 0xFF;
}
/* Verify this is a 1.1 Atmel TPM */ /* Verify this is a 1.1 Atmel TPM */
static int atmel_verify_tpm11(void) static int atmel_verify_tpm11(void)
{ {
......
...@@ -278,6 +278,18 @@ static struct platform_driver nsc_drv = { ...@@ -278,6 +278,18 @@ static struct platform_driver nsc_drv = {
}, },
}; };
static inline int tpm_read_index(int base, int index)
{
outb(index, base);
return inb(base+1) & 0xFF;
}
static inline void tpm_write_index(int base, int index, int value)
{
outb(index, base);
outb(value & 0xFF, base+1);
}
static int __init init_nsc(void) static int __init init_nsc(void)
{ {
int rc = 0; int rc = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment