Commit ede20015 authored May 31, 2019 by Gustavo A. R. Silva Committed by Boris Brezillon Jul 04, 2019

i3c: master: Use struct_size() helper



Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes, in particular in the
context in which this code is being used.

So, replace the following form:

sizeof(*defslvs) + ((ndevs - 1) * sizeof(struct i3c_ccc_dev_desc))

with:

struct_size(defslvs, slaves, ndevs - 1)

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>

parent ea3bfeec

drivers/i3c/master.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -950,9 +950,8 @@ int i3c_master_defslvs_locked(struct i3c_master_controller *master)
	ndevs++;		ndevs++;

	defslvs = i3c_ccc_cmd_dest_init(&dest, I3C_BROADCAST_ADDR,		defslvs = i3c_ccc_cmd_dest_init(&dest, I3C_BROADCAST_ADDR,
	sizeof(*defslvs) +		struct_size(defslvs, slaves,
	((ndevs - 1) *		ndevs - 1));
	sizeof(struct i3c_ccc_dev_desc)));
	if (!defslvs)		if (!defslvs)
	return -ENOMEM;		return -ENOMEM;

Admin message