Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 720ca4a9 authored by Peter Huewe's avatar Peter Huewe Committed by Kent Yoder
Browse files

char/tpm: Remove duplicated lookup table 



The entries in tpm_protected_ordinal_duration are exactly the same as
the first 12 in tpm_ordinal_duration, so we can simply remove this one,
and save some bytes.

This does not change the behavior of the driver.

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarKent Yoder <key@linux.vnet.ibm.com>
parent feab398e

drivers/char/tpm/tpm.c

+1 −17
Original line number Diff line number Diff line
@@ -65,21 +65,6 @@ static DECLARE_BITMAP(dev_mask, TPM_NUM_DEVICES); 
 * values of the SHORT, MEDIUM, and LONG durations are retrieved

 * from the chip during initialization with a call to tpm_get_timeouts.

 */

static const u8 tpm_protected_ordinal_duration[TPM_MAX_PROTECTED_ORDINAL] = {

	TPM_UNDEFINED,		/* 0 */

	TPM_UNDEFINED,

	TPM_UNDEFINED,

	TPM_UNDEFINED,

	TPM_UNDEFINED,

	TPM_UNDEFINED,		/* 5 */

	TPM_UNDEFINED,

	TPM_UNDEFINED,

	TPM_UNDEFINED,

	TPM_UNDEFINED,

	TPM_SHORT,		/* 10 */

	TPM_SHORT,

};



static const u8 tpm_ordinal_duration[TPM_MAX_ORDINAL] = {

	TPM_UNDEFINED,		/* 0 */

	TPM_UNDEFINED,
@@ -357,8 +342,7 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, 
	else if ((ordinal & TPM_PROTECTED_ORDINAL_MASK) <

		 TPM_MAX_PROTECTED_ORDINAL)

		duration_idx =

		    tpm_protected_ordinal_duration[ordinal &

						   TPM_PROTECTED_ORDINAL_MASK];

		    tpm_ordinal_duration[ordinal & TPM_PROTECTED_ORDINAL_MASK];



	if (duration_idx != TPM_UNDEFINED)

		duration = chip->vendor.duration[duration_idx];