tpm: rename vendor data to priv and provide an accessor

  "data" was too generic a name for what's being used as a generic
private pointer by vendor-specific code. Rename it to "priv" and provide
a #define for users.

Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 04b4547..cbee631 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -101,12 +101,14 @@ struct tpm_vendor_specific {
        bool timeout_adjusted;
        unsigned long duration[3]; /* jiffies */
        bool duration_adjusted;
-       void *data;
+       void *priv;
 
        wait_queue_head_t read_queue;
        wait_queue_head_t int_queue;
 };
 
+#define TPM_VPRIV(c)   (c)->vendor.priv
+
 #define TPM_VID_INTEL    0x8086
 
 struct tpm_chip {

diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 9978609..6cd99bc 100644 (file)
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -64,7 +64,7 @@ static struct ibmvtpm_dev *ibmvtpm_get_data(const struct device *dev)
 {
        struct tpm_chip *chip = dev_get_drvdata(dev);
        if (chip)
-               return (struct ibmvtpm_dev *)chip->vendor.data;
+               return (struct ibmvtpm_dev *)TPM_VPRIV(chip);
        return NULL;
 }
 
@@ -83,7 +83,7 @@ static int tpm_ibmvtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count)
        u16 len;
        int sig;
 
-       ibmvtpm = (struct ibmvtpm_dev *)chip->vendor.data;
+       ibmvtpm = (struct ibmvtpm_dev *)TPM_VPRIV(chip);
 
        if (!ibmvtpm->rtce_buf) {
                dev_err(ibmvtpm->dev, "ibmvtpm device is not ready\n");
@@ -127,7 +127,7 @@ static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)
        u64 *word = (u64 *) &crq;
        int rc;
 
-       ibmvtpm = (struct ibmvtpm_dev *)chip->vendor.data;
+       ibmvtpm = (struct ibmvtpm_dev *)TPM_VPRIV(chip);
 
        if (!ibmvtpm->rtce_buf) {
                dev_err(ibmvtpm->dev, "ibmvtpm device is not ready\n");
@@ -647,7 +647,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
 
        ibmvtpm->dev = dev;
        ibmvtpm->vdev = vio_dev;
-       chip->vendor.data = (void *)ibmvtpm;
+       TPM_VPRIV(chip) = (void *)ibmvtpm;
 
        spin_lock_init(&ibmvtpm->rtce_lock);