Commit cfddcb05 authored by Tomas Winkler's avatar Tomas Winkler Committed by Jarkko Sakkinen
Browse files

tpm1: rename tpm1_pcr_read_dev to tpm1_pcr_read() 



Rename tpm1_pcr_read_dev to tpm1_pcr_read() to match
the counterpart tpm2_pcr_read().

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 5e335b5e

drivers/char/tpm/tpm-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ int tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) 
	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		rc = tpm2_pcr_read(chip, pcr_idx, res_buf);

	else

		rc = tpm1_pcr_read_dev(chip, pcr_idx, res_buf);

		rc = tpm1_pcr_read(chip, pcr_idx, res_buf);



	tpm_put_ops(chip);

	return rc;

drivers/char/tpm/tpm-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static ssize_t pcrs_show(struct device *dev, struct device_attribute *attr, 


	num_pcrs = be32_to_cpu(cap.num_pcrs);

	for (i = 0; i < num_pcrs; i++) {

		rc = tpm1_pcr_read_dev(chip, i, digest);

		rc = tpm1_pcr_read(chip, i, digest);

		if (rc)

			break;

		str += sprintf(str, "PCR-%02d: ", i);

drivers/char/tpm/tpm.h

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip); 
unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);

int tpm1_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash,

		    const char *log_msg);

int tpm1_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf);

int tpm1_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf);

ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,

		    const char *desc, size_t min_cap_length);

int tpm1_get_random(struct tpm_chip *chip, u8 *out, size_t max);

drivers/char/tpm/tpm1-cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ out: 
}



#define TPM_ORD_PCRREAD 21

int tpm1_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)

int tpm1_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)

{

	struct tpm_buf buf;

	int rc;
@@ -660,7 +660,7 @@ int tpm1_do_selftest(struct tpm_chip *chip) 


	do {

		/* Attempt to read a PCR value */

		rc = tpm1_pcr_read_dev(chip, 0, dummy);

		rc = tpm1_pcr_read(chip, 0, dummy);



		/* Some buggy TPMs will not respond to tpm_tis_ready() for

		 * around 300ms while the self test is ongoing, keep trying

CRA Git | Maintained and supported by SUSTech CRA and CCSE