tpm/st33zp24: Fix name collision with TPM_BUFSIZE
Subsystems (4)
PATCH 1/1 tpm/st33zp24: Fix name collision with TPM_BUFSIZE
Rename TPM_BUFSIZE defined in drivers/char/tpm/st33zp24/st33zp24.h to ST33ZP24_BUFSIZE as it collides with TPM_BUFSIZE defined in drivers/char/tpm/tpm.h.
--- drivers/char/tpm/st33zp24/i2c.c | 2 +- drivers/char/tpm/st33zp24/spi.c | 2 +- drivers/char/tpm/st33zp24/st33zp24.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/char/tpm/st33zp24/i2c.c +1 -1
@@ -33,7 +33,7 @@struct st33zp24_i2c_phy {struct i2c_client *client; -u8 buf[TPM_BUFSIZE +1 ]; +u8 buf[ST33ZP24_BUFSIZE +1 ];int io_lpcpd; };
drivers/char/tpm/st33zp24/spi.c +1 -1
@@ -63,7 +63,7 @@* some latency byte before the answer is available (max 15). * We have 2048 + 1024 + 15. */ -#define ST33ZP24_SPI_BUFFER_SIZE (TPM_BUFSIZE + (TPM_BUFSIZE / 2) +\ +#define ST33ZP24_SPI_BUFFER_SIZE (ST33ZP24_BUFSIZE + (ST33ZP24_BUFSIZE / 2) +\ MAX_SPI_LATENCY)
drivers/char/tpm/st33zp24/st33zp24.h +2 -2
@@ -18,8 +18,8 @@ #ifndef __LOCAL_ST33ZP24_H__ #define __LOCAL_ST33ZP24_H__ -#define TPM_WRITE_DIRECTION 0x80 -#define TPM_BUFSIZE 2048 +#define TPM_WRITE_DIRECTION 0x80 +#define ST33ZP24_BUFSIZE 2048 struct st33zp24_dev { struct tpm_chip *chip;
Signature · 1 line
2.19.1
Mimi Zohar
maintainerHi Jarkko,
Quoted 7 lines · Jarkko Sakkinen
Rename
TPM_BUFSIZEdefined indrivers/char/tpm/st33zp24/st33zp24.htoST33ZP24_BUFSIZEas it collides withTPM_BUFSIZEdefined indrivers/char/tpm/tpm.h.Fixes bf38b8710892 ("tpm/tpm_i2c_stm_st33: Split tpm_i2c_tpm_st33 in 2 layers (core + phy)")Signed-off-by Jarkko Sakkinen <[email protected]>
FYI, I'm seeing a similar redefined TPM_BUFSIZE in tpm_i2c_infineon.c.
Mimi
Quoted 47 lines
--- drivers/char/tpm/st33zp24/i2c.c | 2 +- drivers/char/tpm/st33zp24/spi.c | 2 +- drivers/char/tpm/st33zp24/st33zp24.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)drivers/char/tpm/st33zp24/i2c.c +1
-1@@ -33,7 +33,7 @@struct st33zp24_i2c_phy {struct i2c_client *client; -u8 buf[TPM_BUFSIZE +1 ]; +u8 buf[ST33ZP24_BUFSIZE +1 ];int io_lpcpd; };drivers/char/tpm/st33zp24/spi.c +1
-1@@ -63,7 +63,7 @@* some latency byte before the answer is available (max 15). * We have 2048 + 1024 + 15. */ -#define ST33ZP24_SPI_BUFFER_SIZE (TPM_BUFSIZE + (TPM_BUFSIZE / 2) +\ +#define ST33ZP24_SPI_BUFFER_SIZE (ST33ZP24_BUFSIZE + (ST33ZP24_BUFSIZE / 2) +\ MAX_SPI_LATENCY)drivers/char/tpm/st33zp24/st33zp24.h +2
-2@@ -18,8 +18,8 @@ #ifndef __LOCAL_ST33ZP24_H__ #define __LOCAL_ST33ZP24_H__ -#define TPM_WRITE_DIRECTION 0x80 -#define TPM_BUFSIZE 2048 +#define TPM_WRITE_DIRECTION 0x80 +#define ST33ZP24_BUFSIZE 2048 struct st33zp24_dev { struct tpm_chip *chip;
Quoted 7 lines · Mimi Zohar
Hi Jarkko,
Quoted 4 lines · Jarkko Sakkinen
Rename
TPM_BUFSIZEdefined indrivers/char/tpm/st33zp24/st33zp24.htoST33ZP24_BUFSIZEas it collides withTPM_BUFSIZEdefined indrivers/char/tpm/tpm.h.
Quoted 5 lines
Quoted 3 lines
Fixes bf38b8710892 ("tpm/tpm_i2c_stm_st33: Split tpm_i2c_tpm_st33 in 2 layers (core + phy)")Signed-off-by Jarkko Sakkinen <[email protected]>FYI, I'm seeing a similar redefined
TPM_BUFSIZEintpm_i2c_infineon.c.
Ugh, I'll fix that one too and send a revised patch. Thanks for pointing that one out!
/Jarkko