OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mailbox: zynq: Switch to flexible array to simplify code 

[ Upstream commit 043f85ce81 ]

Using flexible array is more straight forward. It
  - saves 1 pointer in the 'zynqmp_ipi_pdata' structure
  - saves an indirection when using this array
  - saves some LoC and avoids some always spurious pointer arithmetic

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Stable-dep-of: f72f805e72 ("mailbox: zynqmp: Fix counts of child nodes")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET 2022-11-20 09:25:54 +01:00 committed by Greg Kroah-Hartman
parent b12078b67a
commit e63a796b85
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mailbox/zynqmp-ipi-mailbox.c
View File

@ -110,7 +110,7 @@ struct zynqmp_ipi_pdata {
unsigned int method; unsigned int method;
u32 local_id; u32 local_id;
int num_mboxes; int num_mboxes;
struct zynqmp_ipi_mbox *ipi_mboxes; struct zynqmp_ipi_mbox ipi_mboxes[];
}; };
static struct device_driver zynqmp_ipi_mbox_driver = { static struct device_driver zynqmp_ipi_mbox_driver = {
@ -635,7 +635,7 @@ static int zynqmp_ipi_probe(struct platform_device *pdev)
int num_mboxes, ret = -EINVAL; int num_mboxes, ret = -EINVAL;
num_mboxes = of_get_child_count(np); num_mboxes = of_get_child_count(np);
pdata = devm_kzalloc(dev, sizeof(*pdata) + (num_mboxes * sizeof(*mbox)), pdata = devm_kzalloc(dev, struct_size(pdata, ipi_mboxes, num_mboxes),
GFP_KERNEL); GFP_KERNEL);
if (!pdata) if (!pdata)
return -ENOMEM; return -ENOMEM;
@ -649,8 +649,6 @@ static int zynqmp_ipi_probe(struct platform_device *pdev)
} }
pdata->num_mboxes = num_mboxes; pdata->num_mboxes = num_mboxes;
pdata->ipi_mboxes = (struct zynqmp_ipi_mbox *)
((char *)pdata + sizeof(*pdata));
mbox = pdata->ipi_mboxes; mbox = pdata->ipi_mboxes;
for_each_available_child_of_node(np, nc) { for_each_available_child_of_node(np, nc) {