tpm: tpm_tis_i2c: Drop unnecessary methods

The function methods in struct tpm_vendor_specific just call local functions.
Change the code to use a direct call.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>

diff --git a/drivers/tpm/tpm_tis_i2c.c b/drivers/tpm/tpm_tis_i2c.c
index e547f0ad9f311db9074e16b145244ee242562bbb..6a3991f9870ea72f2bf089d8638d7f2e267db731 100644 (file)
--- a/drivers/tpm/tpm_tis_i2c.c
+++ b/drivers/tpm/tpm_tis_i2c.c
@@ -810,10 +810,6 @@ out_err:
 }
 
 static struct tpm_vendor_specific tpm_tis_i2c = {
-       .status = tpm_tis_i2c_status,
-       .recv = tpm_tis_i2c_recv,
-       .send = tpm_tis_i2c_send,
-       .cancel = tpm_tis_i2c_ready,
        .req_complete_mask = TPM_STS_DATA_AVAIL | TPM_STS_VALID,
        .req_complete_val = TPM_STS_DATA_AVAIL | TPM_STS_VALID,
        .req_canceled = TPM_STS_COMMAND_READY,
@@ -940,7 +936,7 @@ static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
        }
 
        debug("Calling send\n");
-       rc = chip->vendor.send(chip, (u8 *)buf, count);
+       rc = tpm_tis_i2c_send(chip, (u8 *)buf, count);
        debug("   ... done calling send\n");
        if (rc < 0) {
                error("tpm_transmit: tpm_send: error %d\n", rc);
@@ -954,7 +950,7 @@ static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
        stop = tpm_calc_ordinal_duration(chip, ordinal);
        do {
                debug("waiting for status... %ld %ld\n", start, stop);
-               u8 status = chip->vendor.status(chip);
+               u8 status = tpm_tis_i2c_status(chip);
                if ((status & chip->vendor.req_complete_mask) ==
                    chip->vendor.req_complete_val) {
                        debug("...got it;\n");
@@ -969,14 +965,14 @@ static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
                udelay(TPM_TIMEOUT * 1000);
        } while (get_timer(start) < stop);
 
-       chip->vendor.cancel(chip);
+       tpm_tis_i2c_ready(chip);
        error("Operation Timed out\n");
        rc = -ETIME;
        goto out;
 
 out_recv:
        debug("out_recv: reading response...\n");
-       rc = chip->vendor.recv(chip, (u8 *)buf, TPM_BUFSIZE);
+       rc = tpm_tis_i2c_recv(chip, (u8 *)buf, TPM_BUFSIZE);
        if (rc < 0)
                error("tpm_transmit: tpm_recv: error %d\n", rc);
 

diff --git a/drivers/tpm/tpm_tis_i2c.h b/drivers/tpm/tpm_tis_i2c.h
index 75fa829e3d98b6134895d0951a15444038a6f7c3..426c519811d5f16fb242bd43033159b3f3b4a531 100644 (file)
--- a/drivers/tpm/tpm_tis_i2c.h
+++ b/drivers/tpm/tpm_tis_i2c.h
@@ -40,10 +40,6 @@ struct tpm_vendor_specific {
        const u8 req_complete_val;
        const u8 req_canceled;
        int irq;
-       int (*recv) (struct tpm_chip *, u8 *, size_t);
-       int (*send) (struct tpm_chip *, u8 *, size_t);
-       void (*cancel) (struct tpm_chip *);
-       u8(*status) (struct tpm_chip *);
        int locality;
        unsigned long timeout_a, timeout_b, timeout_c, timeout_d;  /* msec */
        unsigned long duration[3];  /* msec */