Commit cbdd13bf authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Bjorn Andersson
Browse files

soc: qcom: smem: Use struct_size() 



Use struct_size() instead of hand-writing it, when allocating a structure
with a flex array.

This is less verbose.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/f74328551cfab0262ba353f37d047ac74bf616e1.1689194490.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 7bc1cfae

drivers/soc/qcom/smem.c

+2 −3
Original line number Diff line number Diff line
@@ -1059,7 +1059,6 @@ static int qcom_smem_probe(struct platform_device *pdev) 
	struct reserved_mem *rmem;

	struct qcom_smem *smem;

	unsigned long flags;

	size_t array_size;

	int num_regions;

	int hwlock_id;

	u32 version;
@@ -1071,8 +1070,8 @@ static int qcom_smem_probe(struct platform_device *pdev) 
	if (of_property_present(pdev->dev.of_node, "qcom,rpm-msg-ram"))

		num_regions++;



	array_size = num_regions * sizeof(struct smem_region);

	smem = devm_kzalloc(&pdev->dev, sizeof(*smem) + array_size, GFP_KERNEL);

	smem = devm_kzalloc(&pdev->dev, struct_size(smem, regions, num_regions),

			    GFP_KERNEL);

	if (!smem)

		return -ENOMEM;