summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorPeter Huewe <peterhuewe@gmx.de>2013-01-29 22:01:59 +0100
committerKent Yoder <key@linux.vnet.ibm.com>2013-02-05 09:38:25 -0600
commit64298919ad034aa07a6ec85b82e5c8861e364ae5 (patch)
tree3629ae0922e2825cca7e70eaabe7e7c9409ee055 /drivers/char
parentd479042c82941772cb1c003b46707d55185a49f6 (diff)
downloadlinux-64298919ad034aa07a6ec85b82e5c8861e364ae5.tar.gz
linux-64298919ad034aa07a6ec85b82e5c8861e364ae5.tar.bz2
linux-64298919ad034aa07a6ec85b82e5c8861e364ae5.zip
char/tpm/tpm_i2c_stm_st33: Don't use memcpy for one byte assignment
We don't need to call memcpy for one byte, but assign it directly. And to make the offset clearer we use the array syntax on the subsequent call to memset to make the relationship clearer. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tpm/tpm_i2c_stm_st33.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index 8c60d33d116c..16f1f785c0b9 100644
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -96,15 +96,13 @@ enum tis_defaults {
static int write8_reg(struct i2c_client *client, u8 tpm_register,
u8 *tpm_data, u16 tpm_size)
{
- u8 data;
int value = 0;
struct st33zp24_platform_data *pin_infos;
pin_infos = client->dev.platform_data;
- data = tpm_register;
- memcpy(pin_infos->tpm_i2c_buffer[0], &data, sizeof(data));
- memcpy(pin_infos->tpm_i2c_buffer[0] + 1, tpm_data, tpm_size);
+ pin_infos->tpm_i2c_buffer[0][0] = tpm_register;
+ memcpy(&pin_infos->tpm_i2c_buffer[0][1], tpm_data, tpm_size);
value = i2c_master_send(client, pin_infos->tpm_i2c_buffer[0],
tpm_size + 1);
return value;