From 64298919ad034aa07a6ec85b82e5c8861e364ae5 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Tue, 29 Jan 2013 22:01:59 +0100 Subject: 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 Signed-off-by: Kent Yoder --- drivers/char/tpm/tpm_i2c_stm_st33.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/char') 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; -- cgit v1.2.3