aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm_i2c_stm_st33.c
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2014-12-01 13:32:49 -0500
committerPeter Huewe <peterhuewe@gmx.de>2015-01-17 08:00:06 -0500
commit7500c4b99bddf1b01440bb430d7e38e7652817bf (patch)
tree435be9fb9a7c8521d83d18b44e09818ff2a2055b /drivers/char/tpm/tpm_i2c_stm_st33.c
parent642d2be22a746ba756e0273e19977f1794fe080c (diff)
tpm/tpm_i2c_stm_st33: Fix few coding style error reported by scripts/checkpatch.pl
Fix: - WARNING: Missing a blank line after declarations - WARNING: braces {} are not necessary for any arm of this statement Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Diffstat (limited to 'drivers/char/tpm/tpm_i2c_stm_st33.c')
-rw-r--r--drivers/char/tpm/tpm_i2c_stm_st33.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index bf1e53093873..c4925a03d7ab 100644
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -156,6 +156,7 @@ static int read8_reg(struct i2c_client *client, u8 tpm_register,
156static void clear_interruption(struct i2c_client *client) 156static void clear_interruption(struct i2c_client *client)
157{ 157{
158 u8 interrupt; 158 u8 interrupt;
159
159 I2C_READ_DATA(client, TPM_INT_STATUS, &interrupt, 1); 160 I2C_READ_DATA(client, TPM_INT_STATUS, &interrupt, 1);
160 I2C_WRITE_DATA(client, TPM_INT_STATUS, &interrupt, 1); 161 I2C_WRITE_DATA(client, TPM_INT_STATUS, &interrupt, 1);
161 I2C_READ_DATA(client, TPM_INT_STATUS, &interrupt, 1); 162 I2C_READ_DATA(client, TPM_INT_STATUS, &interrupt, 1);
@@ -232,6 +233,7 @@ static u8 tpm_stm_i2c_status(struct tpm_chip *chip)
232{ 233{
233 struct i2c_client *client; 234 struct i2c_client *client;
234 u8 data; 235 u8 data;
236
235 client = (struct i2c_client *)TPM_VPRIV(chip); 237 client = (struct i2c_client *)TPM_VPRIV(chip);
236 238
237 I2C_READ_DATA(client, TPM_STS, &data, 1); 239 I2C_READ_DATA(client, TPM_STS, &data, 1);
@@ -783,11 +785,11 @@ static int tpm_st33_i2c_pm_suspend(struct device *dev)
783 struct st33zp24_platform_data *pin_infos = dev->platform_data; 785 struct st33zp24_platform_data *pin_infos = dev->platform_data;
784 int ret = 0; 786 int ret = 0;
785 787
786 if (power_mgt) { 788 if (power_mgt)
787 gpio_set_value(pin_infos->io_lpcpd, 0); 789 gpio_set_value(pin_infos->io_lpcpd, 0);
788 } else { 790 else
789 ret = tpm_pm_suspend(dev); 791 ret = tpm_pm_suspend(dev);
790 } 792
791 return ret; 793 return ret;
792} /* tpm_st33_i2c_suspend() */ 794} /* tpm_st33_i2c_suspend() */
793 795