Commit 6f1d4d2e authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jarkko Sakkinen
Browse files

tpm: avoid -Wunused-but-set-variable 



Outside of the EFI tpm code, the TPM_MEMREMAP()/TPM_MEMUNMAP functions are
defined as trivial macros, leading to the mapping_size variable ending
up unused:

In file included from drivers/char/tpm/tpm-sysfs.c:16:
In file included from drivers/char/tpm/tpm.h:28:
include/linux/tpm_eventlog.h:167:6: error: variable 'mapping_size' set but not used [-Werror,-Wunused-but-set-variable]
  167 |         int mapping_size;

Turn the stubs into inline functions to avoid this warning.

Cc: stable@vger.kernel.org # v5.3+
Fixes: c46f3405 ("tpm: Reserve the TPM final events table")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent c424d266

include/linux/tpm_eventlog.h

+7 −2
Original line number Diff line number Diff line
@@ -131,11 +131,16 @@ struct tcg_algorithm_info { 
};



#ifndef TPM_MEMREMAP

#define TPM_MEMREMAP(start, size) NULL

static inline void *TPM_MEMREMAP(unsigned long start, size_t size)

{

	return NULL;

}

#endif



#ifndef TPM_MEMUNMAP

#define TPM_MEMUNMAP(start, size) do{} while(0)

static inline void TPM_MEMUNMAP(void *mapping, size_t size)

{

}

#endif



/**