mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

tpm: rename tpm_chip_find_get() to tpm_find_get_ops()

Browse source 
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>
This commit is contained in:
Stefan Berger 2018-06-26 07:06:15 -04:00 committed by Jarkko Sakkinen
parent 7a64c5597a
commit fc1d52b745
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/char/tpm/tpm-chip.c
View file

@ -81,18 +81,21 @@ void tpm_put_ops(struct tpm_chip *chip)
EXPORT_SYMBOL_GPL(tpm_put_ops); 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 * @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 * 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: * Return:
* A reserved &struct tpm_chip instance. * A reserved &struct tpm_chip instance.
* %NULL if a chip is not found. * %NULL if a chip is not found.
* %NULL if the chip is not available. * %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; struct tpm_chip *res = NULL;
int chip_num = 0; int chip_num = 0;

14
drivers/char/tpm/tpm-interface.c
View file

@ -961,7 +961,7 @@ int tpm_is_tpm2(struct tpm_chip *chip)
{ {
int rc; int rc;
chip = tpm_chip_find_get(chip); chip = tpm_find_get_ops(chip);
if (!chip) if (!chip)
return -ENODEV; return -ENODEV;
@ -985,7 +985,7 @@ int tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
{ {
int rc; int rc;
chip = tpm_chip_find_get(chip); chip = tpm_find_get_ops(chip);
if (!chip) if (!chip)
return -ENODEV; return -ENODEV;
if (chip->flags & TPM_CHIP_FLAG_TPM2) 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; u32 count = 0;
int i; int i;
chip = tpm_chip_find_get(chip); chip = tpm_find_get_ops(chip);
if (!chip) if (!chip)
return -ENODEV; return -ENODEV;
@ -1173,7 +1173,7 @@ int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen)
{ {
int rc; int rc;
chip = tpm_chip_find_get(chip); chip = tpm_find_get_ops(chip);
if (!chip) if (!chip)
return -ENODEV; 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) if (!out || !num_bytes || max > TPM_MAX_RNG_DATA)
return -EINVAL; return -EINVAL;
chip = tpm_chip_find_get(chip); chip = tpm_find_get_ops(chip);
if (!chip) if (!chip)
return -ENODEV; return -ENODEV;
@ -1355,7 +1355,7 @@ int tpm_seal_trusted(struct tpm_chip *chip, struct trusted_key_payload *payload,
{ {
int rc; int rc;
chip = tpm_chip_find_get(chip); chip = tpm_find_get_ops(chip);
if (!chip || !(chip->flags & TPM_CHIP_FLAG_TPM2)) if (!chip || !(chip->flags & TPM_CHIP_FLAG_TPM2))
return -ENODEV; return -ENODEV;
@ -1383,7 +1383,7 @@ int tpm_unseal_trusted(struct tpm_chip *chip,
{ {
int rc; int rc;
chip = tpm_chip_find_get(chip); chip = tpm_find_get_ops(chip);
if (!chip || !(chip->flags & TPM_CHIP_FLAG_TPM2)) if (!chip || !(chip->flags & TPM_CHIP_FLAG_TPM2))
return -ENODEV; return -ENODEV;

2
drivers/char/tpm/tpm.h
View file

@ -547,7 +547,7 @@ static inline void tpm_msleep(unsigned int delay_msec)
delay_msec * 1000); 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); __must_check int tpm_try_get_ops(struct tpm_chip *chip);
void tpm_put_ops(struct tpm_chip *chip); void tpm_put_ops(struct tpm_chip *chip);