diff options
| author | Shubhrajyoti Datta <omaplinuxkernel@gmail.com> | 2013-02-28 11:06:11 +0100 |
|---|---|---|
| committer | Kent Yoder <key@linux.vnet.ibm.com> | 2013-04-12 12:17:28 -0500 |
| commit | eef8b6291987c059dacb07dd516d4ada0e3362af (patch) | |
| tree | 1508b9472f0a4d2355a717d79d6cc302be7c032a | |
| parent | e361200bfc3b72de8db246de209da55d6d60fd34 (diff) | |
| download | op-kernel-dev-eef8b6291987c059dacb07dd516d4ada0e3362af.zip op-kernel-dev-eef8b6291987c059dacb07dd516d4ada0e3362af.tar.gz | |
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>
| -rw-r--r-- | drivers/char/tpm/tpm_i2c_infineon.c | 19 |
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 8fe7ac3..8e47e2b 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; static int iic_tpm_read(u8 addr, u8 *buffer, size_t len) { - struct i2c_msg msg1 = { tpm_dev.client->addr, 0, 1, &addr }; - struct i2c_msg msg2 = { tpm_dev.client->addr, I2C_M_RD, len, buffer }; + struct i2c_msg msg1 = { + .addr = tpm_dev.client->addr, + .len = 1, + .buf = &addr + }; + struct i2c_msg msg2 = { + .addr = tpm_dev.client->addr, + .flags = I2C_M_RD, + .len = len, + .buf = buffer + }; int rc; int count; @@ -138,7 +147,11 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len, int rc = -EIO; int count; - struct i2c_msg msg1 = { tpm_dev.client->addr, 0, len + 1, tpm_dev.buf }; + struct i2c_msg msg1 = { + .addr = tpm_dev.client->addr, + .len = len + 1, + .buf = tpm_dev.buf + }; if (len > TPM_BUFSIZE) return -EINVAL; |
