Skip to content

Commit 586dafc

Browse files
PrachotanReddyjarkkojs
authored andcommitted
tpm_crb_ffa: Remove memset usage
Simplify initialization of `ffa_send_direct_data2` and `ffa_send_direct_data` structures by using designated initializers instead of `memset()` followed by field assignments, reducing code size and improving readability. Signed-off-by: Prachotan Bathi <prachotan.bathi@arm.com> Suggested-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
1 parent 8b32509 commit 586dafc

1 file changed

Lines changed: 9 additions & 14 deletions

File tree

drivers/char/tpm/tpm_crb_ffa.c

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -203,26 +203,21 @@ static int __tpm_crb_ffa_send_receive(unsigned long func_id,
203203
msg_ops = tpm_crb_ffa->ffa_dev->ops->msg_ops;
204204

205205
if (ffa_partition_supports_direct_req2_recv(tpm_crb_ffa->ffa_dev)) {
206-
memset(&tpm_crb_ffa->direct_msg_data2, 0x00,
207-
sizeof(struct ffa_send_direct_data2));
208-
209-
tpm_crb_ffa->direct_msg_data2.data[0] = func_id;
210-
tpm_crb_ffa->direct_msg_data2.data[1] = a0;
211-
tpm_crb_ffa->direct_msg_data2.data[2] = a1;
212-
tpm_crb_ffa->direct_msg_data2.data[3] = a2;
206+
tpm_crb_ffa->direct_msg_data2 = (struct ffa_send_direct_data2){
207+
.data = { func_id, a0, a1, a2 },
208+
};
213209

214210
ret = msg_ops->sync_send_receive2(tpm_crb_ffa->ffa_dev,
215211
&tpm_crb_ffa->direct_msg_data2);
216212
if (!ret)
217213
ret = tpm_crb_ffa_to_linux_errno(tpm_crb_ffa->direct_msg_data2.data[0]);
218214
} else {
219-
memset(&tpm_crb_ffa->direct_msg_data, 0x00,
220-
sizeof(struct ffa_send_direct_data));
221-
222-
tpm_crb_ffa->direct_msg_data.data1 = func_id;
223-
tpm_crb_ffa->direct_msg_data.data2 = a0;
224-
tpm_crb_ffa->direct_msg_data.data3 = a1;
225-
tpm_crb_ffa->direct_msg_data.data4 = a2;
215+
tpm_crb_ffa->direct_msg_data = (struct ffa_send_direct_data){
216+
.data1 = func_id,
217+
.data2 = a0,
218+
.data3 = a1,
219+
.data4 = a2,
220+
};
226221

227222
ret = msg_ops->sync_send_receive(tpm_crb_ffa->ffa_dev,
228223
&tpm_crb_ffa->direct_msg_data);

0 commit comments

Comments
 (0)