dmaengine: lpc18xx-dmamux: simplify allocation
Subsystems (2)
PATCH 1/1 dmaengine: lpc18xx-dmamux: simplify allocation
Use a flexible array member to combine allocations. Requires preparation, aka reshuffling before the actual allocation to get the proper size.
Add __counted_by for extra runtime analysis.
Signed-off-by Rosen Penev <[email protected]>
--- drivers/dma/lpc18xx-dmamux.c | 42 +++++++++++++++++------------------- 1 file changed, 20 insertions(+), 22 deletions(-)
drivers/dma/lpc18xx-dmamux.c +20 -22
@@ -32,11 +32,11 @@ struct lpc18xx_dmamux {struct lpc18xx_dmamux_data {struct dma_router dmarouter; -struct lpc18xx_dmamux *muxes;u32 dma_master_requests;u32 dma_mux_requests;struct regmap *reg;spinlock_t lock; + struct lpc18xx_dmamux muxes[] __counted_by(dma_master_requests); };static void lpc18xx_dmamux_free (struct device *dev,void *route_data)
@@ -122,12 +122,30 @@ static int lpc18xx_dmamux_probe(struct platform_device *pdev) {struct device_node *dma_np, *np = pdev->dev.of_node;struct lpc18xx_dmamux_data *dmamux; +u32 dma_master_requests;int ret; - dmamux =devm_kzalloc (&pdev->dev,sizeof (*dmamux),GFP_KERNEL ); + dma_np =of_parse_phandle (np,"dma-masters" ,0 ); +if (!dma_np) { +dev_err (&pdev->dev,"can't get dma master\n" ); +return -ENODEV ; + } + + ret =of_property_read_u32 (dma_np,"dma-requests" , + &dma_master_requests); +of_node_put (dma_np); +if (ret) { +dev_err (&pdev->dev,"missing master dma-requests property\n" ); +return ret; + } + + dmamux =devm_kzalloc (&pdev->dev,struct_size (dmamux, muxes, dma_master_requests), +GFP_KERNEL );if (!dmamux)return -ENOMEM ; + dmamux->dma_master_requests = dma_master_requests; + dmamux->reg =syscon_regmap_lookup_by_compatible ("nxp,lpc1850-creg" );if (IS_ERR (dmamux->reg)) {dev_err (&pdev->dev,"syscon lookup failed\n" );
@@ -141,26 +159,6 @@ static int lpc18xx_dmamux_probe(struct platform_device *pdev)return ret; } - dma_np =of_parse_phandle (np,"dma-masters" ,0 ); -if (!dma_np) { -dev_err (&pdev->dev,"can't get dma master\n" ); -return -ENODEV ; - } - - ret =of_property_read_u32 (dma_np,"dma-requests" , - &dmamux->dma_master_requests); -of_node_put (dma_np); -if (ret) { -dev_err (&pdev->dev,"missing master dma-requests property\n" ); -return ret; - } - - dmamux->muxes =devm_kcalloc (&pdev->dev, dmamux->dma_master_requests, -sizeof (struct lpc18xx_dmamux ), -GFP_KERNEL ); -if (!dmamux->muxes) -return -ENOMEM ; -spin_lock_init (&dmamux->lock);platform_set_drvdata (pdev, dmamux); dmamux->dmarouter.dev = &pdev->dev;
Signature · 1 line
2.53.0
Quoted 77 lines · Rosen Penev
Use a flexible array member to combine allocations. Requires preparation, aka reshuffling before the actual allocation to get the proper size.
Add
__counted_byfor extra runtime analysis.Signed-off-by Rosen Penev <[email protected]>--- drivers/dma/lpc18xx-dmamux.c | 42 +++++++++++++++++------------------- 1 file changed, 20 insertions(+), 22 deletions(-)drivers/dma/lpc18xx-dmamux.c +20
-15@@ -32,11 +32,11 @@ struct lpc18xx_dmamux {struct lpc18xx_dmamux_data {struct dma_router dmarouter; -struct lpc18xx_dmamux *muxes;u32 dma_master_requests;u32 dma_mux_requests;struct regmap *reg;spinlock_t lock; + struct lpc18xx_dmamux muxes[] __counted_by(dma_master_requests); };static void lpc18xx_dmamux_free (struct device *dev,void *route_data)@@ -122,12 +122,30 @@ static int lpc18xx_dmamux_probe(struct platform_device *pdev) {struct device_node *dma_np, *np = pdev->dev.of_node;struct lpc18xx_dmamux_data *dmamux; +u32 dma_master_requests;int ret; - dmamux =devm_kzalloc (&pdev->dev,sizeof (*dmamux),GFP_KERNEL ); + dma_np =of_parse_phandle (np,"dma-masters" ,0 ); +if (!dma_np) { +dev_err (&pdev->dev,"can't get dma master\n" ); +return -ENODEV ; + } + + ret =of_property_read_u32 (dma_np,"dma-requests" , + &dma_master_requests); +of_node_put (dma_np); +if (ret) { +dev_err (&pdev->dev,"missing master dma-requests property\n" ); +return ret; + } + + dmamux =devm_kzalloc (&pdev->dev,struct_size (dmamux, muxes, dma_master_requests), +GFP_KERNEL );if (!dmamux)return -ENOMEM ; + dmamux->dma_master_requests = dma_master_requests; + dmamux->reg =syscon_regmap_lookup_by_compatible ("nxp,lpc1850-creg" );if (IS_ERR (dmamux->reg)) {dev_err (&pdev->dev,"syscon lookup failed\n" );@@ -141,26 +159,6 @@ static int lpc18xx_dmamux_probe(struct platform_device *pdev)return ret; } - dma_np =of_parse_phandle (np,"dma-masters" ,0 ); -if (!dma_np) { -dev_err (&pdev->dev,"can't get dma master\n" ); -return -ENODEV ; - } - - ret =of_property_read_u32 (dma_np,"dma-requests" , - &dmamux->dma_master_requests); -of_node_put (dma_np); -if (ret) { -dev_err (&pdev->dev,"missing master dma-requests property\n" ); -return ret; - }
drivers/dma/lpc18xx-dmamux.c static int lpc18xx_dmamux_probe(struct platform_device *pdev) · line 164
Quoted 10 lines
drivers/dma/lpc18xx-dmamux.c +0
-7- - dmamux->muxes =devm_kcalloc (&pdev->dev, dmamux->dma_master_requests, -sizeof (struct lpc18xx_dmamux ), -GFP_KERNEL ); -if (!dmamux->muxes) -return -ENOMEM ; -spin_lock_init (&dmamux->lock);platform_set_drvdata (pdev, dmamux); dmamux->dmarouter.dev = &pdev->dev;
Reviewed-by Vladimir Zapolskiy <[email protected]>
Signature · 2 lines
Best wishes, Vladimir
On Mon, Apr 06, 2026 at 08:51:32PM -0700, Rosen Penev wrote:
Subject need descript summary.
dmaengine: lpc18xx-dmamux: use flexible array to simplify allocation
Frank