aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm
diff options
context:
space:
mode:
authorShubhrajyoti Datta <omaplinuxkernel@gmail.com>2013-02-28 05:06:11 -0500
committerKent Yoder <key@linux.vnet.ibm.com>2013-04-12 13:17:28 -0400
commiteef8b6291987c059dacb07dd516d4ada0e3362af (patch)
tree1508b9472f0a4d2355a717d79d6cc302be7c032a /drivers/char/tpm
parente361200bfc3b72de8db246de209da55d6d60fd34 (diff)
char/tpm: Convert struct i2c_msg initialization to C99 format
Convert the struct i2c_msg initialization to C99 format. This makes maintaining and editing the code simpler. Also helps once other fields like transferred are added in future. Thanks to Julia Lawall for automating the conversion. Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Acked-by: Peter Huewe <peter.huewe@infineon.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r--drivers/char/tpm/tpm_i2c_infineon.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
index 8fe7ac3d095b..8e47e2b99efc 100644
--- a/drivers/char/tpm/tpm_i2c_infineon.c
+++ b/drivers/char/tpm/tpm_i2c_infineon.c
@@ -90,8 +90,17 @@ static struct i2c_driver tpm_tis_i2c_driver;
90static int iic_tpm_read(u8 addr, u8 *buffer, size_t len) 90static int iic_tpm_read(u8 addr, u8 *buffer, size_t len)
91{ 91{
92 92
93 struct i2c_msg msg1 = { tpm_dev.client->addr, 0, 1, &addr }; 93 struct i2c_msg msg1 = {
94 struct i2c_msg msg2 = { tpm_dev.client->addr, I2C_M_RD, len, buffer }; 94 .addr = tpm_dev.client->addr,
95 .len = 1,
96 .buf = &addr
97 };
98 struct i2c_msg msg2 = {
99 .addr = tpm_dev.client->addr,
100 .flags = I2C_M_RD,
101 .len = len,
102 .buf = buffer
103 };
95 104
96 int rc; 105 int rc;
97 int count; 106 int count;
@@ -138,7 +147,11 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len,
138 int rc = -EIO; 147 int rc = -EIO;
139 int count; 148 int count;
140 149
141 struct i2c_msg msg1 = { tpm_dev.client->addr, 0, len + 1, tpm_dev.buf }; 150 struct i2c_msg msg1 = {
151 .addr = tpm_dev.client->addr,
152 .len = len + 1,
153 .buf = tpm_dev.buf
154 };
142 155
143 if (len > TPM_BUFSIZE) 156 if (len > TPM_BUFSIZE)
144 return -EINVAL; 157 return -EINVAL;