tpm: rename tpm_chip_find_get() to tpm_find_get_ops()

Rename tpm_chip_find_get() to tpm_find_get_ops() to more closely match
the tpm_put_ops() counter part.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 0a62c19937b6177c7f155fa26aa7bbe33183c73d..242b716aed5e51f55d08d615f1b0e9b0851e6d94 100644 (file)
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -81,18 +81,21 @@ void tpm_put_ops(struct tpm_chip *chip)
 EXPORT_SYMBOL_GPL(tpm_put_ops);
 
 /**
- * tpm_chip_find_get() - find and reserve a TPM chip
+ * tpm_find_get_ops() - find and reserve a TPM chip
  * @chip:      a &struct tpm_chip instance, %NULL for the default chip
  *
  * Finds a TPM chip and reserves its class device and operations. The chip must
- * be released with tpm_chip_put_ops() after use.
+ * be released with tpm_put_ops() after use.
+ * This function is for internal use only. It supports existing TPM callers
+ * by accepting NULL, but those callers should be converted to pass in a chip
+ * directly.
  *
  * Return:
  * A reserved &struct tpm_chip instance.
  * %NULL if a chip is not found.
  * %NULL if the chip is not available.
  */
-struct tpm_chip *tpm_chip_find_get(struct tpm_chip *chip)
+struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip)
 {
        struct tpm_chip *res = NULL;
        int chip_num = 0;

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 3a3a7a548a85a9b850f47ad2560009d172f92236..ad761e629a0f5ebd8763dbf2854d9d8de039223a 100644 (file)
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -961,7 +961,7 @@ int tpm_is_tpm2(struct tpm_chip *chip)
 {
        int rc;
 
-       chip = tpm_chip_find_get(chip);
+       chip = tpm_find_get_ops(chip);
        if (!chip)
                return -ENODEV;
 
@@ -985,7 +985,7 @@ int tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
 {
        int rc;
 
-       chip = tpm_chip_find_get(chip);
+       chip = tpm_find_get_ops(chip);
        if (!chip)
                return -ENODEV;
        if (chip->flags & TPM_CHIP_FLAG_TPM2)
@@ -1044,7 +1044,7 @@ int tpm_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash)
        u32 count = 0;
        int i;
 
-       chip = tpm_chip_find_get(chip);
+       chip = tpm_find_get_ops(chip);
        if (!chip)
                return -ENODEV;
 
@@ -1173,7 +1173,7 @@ int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen)
 {
        int rc;
 
-       chip = tpm_chip_find_get(chip);
+       chip = tpm_find_get_ops(chip);
        if (!chip)
                return -ENODEV;
 
@@ -1293,7 +1293,7 @@ int tpm_get_random(struct tpm_chip *chip, u8 *out, size_t max)
        if (!out || !num_bytes || max > TPM_MAX_RNG_DATA)
                return -EINVAL;
 
-       chip = tpm_chip_find_get(chip);
+       chip = tpm_find_get_ops(chip);
        if (!chip)
                return -ENODEV;
 
@@ -1355,7 +1355,7 @@ int tpm_seal_trusted(struct tpm_chip *chip, struct trusted_key_payload *payload,
 {
        int rc;
 
-       chip = tpm_chip_find_get(chip);
+       chip = tpm_find_get_ops(chip);
        if (!chip || !(chip->flags & TPM_CHIP_FLAG_TPM2))
                return -ENODEV;
 
@@ -1383,7 +1383,7 @@ int tpm_unseal_trusted(struct tpm_chip *chip,
 {
        int rc;
 
-       chip = tpm_chip_find_get(chip);
+       chip = tpm_find_get_ops(chip);
        if (!chip || !(chip->flags & TPM_CHIP_FLAG_TPM2))
                return -ENODEV;
 

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 17833ef63f6c7807c7dbc5f502fbe030d45571cd..ba01488cd029cc64aea94c03f5b6dac7753e4f79 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -547,7 +547,7 @@ static inline void tpm_msleep(unsigned int delay_msec)
                     delay_msec * 1000);
 };
 
-struct tpm_chip *tpm_chip_find_get(struct tpm_chip *chip);
+struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip);
 __must_check int tpm_try_get_ops(struct tpm_chip *chip);
 void tpm_put_ops(struct tpm_chip *chip);