Skip to contentSkip to conversation

tpm/st33zp24: Fix name collision with TPM_BUFSIZE

PATCH In review Jarkko Sakkinen 2 participants 3 messages Feb 1, 2019 – Feb 4, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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.

Fixes bf38b8710892 ("tpm/tpm_i2c_stm_st33: Split tpm_i2c_tpm_st33 in 2 layers (core + phy)")
---
 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
index be5d1abd3e8e..8390c5b54c3b 100644
@@ -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
index d7909ab287a8..ff019a1e3c68 100644
@@ -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
index 6f4a4198af6a..20da0a84988d 100644
@@ -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
maintainer
#1 lore raw

Hi Jarkko,

Quoted 7 lines · Jarkko Sakkinen

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.

Fixes bf38b8710892 ("tpm/tpm_i2c_stm_st33: Split tpm_i2c_tpm_st33 in 2 layers (core + phy)")

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
index be5d1abd3e8e..8390c5b54c3b 100644
@@ -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
index d7909ab287a8..ff019a1e3c68 100644
@@ -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
index 6f4a4198af6a..20da0a84988d 100644
@@ -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;
#2 lore raw
Quoted 7 lines · Mimi Zohar

Hi Jarkko,

Quoted 4 lines · Jarkko Sakkinen

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.

Quoted 5 lines
Quoted 3 lines
Fixes bf38b8710892 ("tpm/tpm_i2c_stm_st33: Split tpm_i2c_tpm_st33 in 2 layers (core + phy)")

FYI, I'm seeing a similar redefined TPM_BUFSIZE in tpm_i2c_infineon.c.

Ugh, I'll fix that one too and send a revised patch. Thanks for pointing that one out!

/Jarkko