On Mon, Nov 12, 2012 at 11:37:17PM +0100, Peter Huewe wrote:
> 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: Peter Huewe <peterhu...@gmx.de>
Applied, thanks.
Kent
> ---
> This patch reflects only my opinion and work,
> and is not related to my employer or anybody else.
>
> drivers/char/tpm/tpm.c | 18 +-----------------
> 1 files changed, 1 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
> index 93211df..9e3c529 100644
> --- a/drivers/char/tpm/tpm.c
> +++ b/drivers/char/tpm/tpm.c
> @@ -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];
> --
> 1.7.8.6
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
