drivers/char/tpm/tpm-buf.c | 143 ++++++---- drivers/char/tpm/tpm-sysfs.c | 21 +- drivers/char/tpm/tpm.h | 1 - drivers/char/tpm/tpm1-cmd.c | 166 +++++------ drivers/char/tpm/tpm2-cmd.c | 320 ++++++++++------------ drivers/char/tpm/tpm2-sessions.c | 144 +++++----- drivers/char/tpm/tpm2-space.c | 44 ++- drivers/char/tpm/tpm_vtpm_proxy.c | 30 +- include/linux/tpm.h | 30 +- security/keys/trusted-keys/trusted_tpm1.c | 36 +-- security/keys/trusted-keys/trusted_tpm2.c | 170 ++++++------ 11 files changed, 523 insertions(+), 582 deletions(-)