[PATCHv4 09/15] dmaengine: fsldma: use devm_kzalloc() to simplify code
From: Rosen Penev <hidden>
Date: 2026-06-11 03:53:17
Also in:
dmaengine, lkml, llvm
Subsystem:
dma generic offload engine subsystem, freescale dma driver, the rest · Maintainers:
Vinod Koul, Zhang Wei, Linus Torvalds
Convert fdev allocation from kzalloc_obj() to devm_kzalloc() to simplify the probe error and remove paths by dropping the explicit kfree. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev <redacted> --- drivers/dma/fsldma.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index eba194d64105..c3d2b24f8f07 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c@@ -1222,29 +1222,25 @@ static void fsldma_device_release(struct dma_device *dma_dev); static int fsldma_of_probe(struct platform_device *op) { + struct device *dev = &op->dev; struct fsldma_device *fdev; struct device_node *child; unsigned int i; int err; - fdev = kzalloc_obj(*fdev); - if (!fdev) { - err = -ENOMEM; - goto out_return; - } + fdev = devm_kzalloc(dev, sizeof(*fdev), GFP_KERNEL); + if (!fdev) + return -ENOMEM; - fdev->dev = &op->dev; + fdev->dev = dev; INIT_LIST_HEAD(&fdev->common.channels); /* The DMA address bits supported for this device. */ fdev->addr_bits = (long)device_get_match_data(fdev->dev); /* ioremap the registers for use */ fdev->regs = of_iomap(op->dev.of_node, 0); - if (!fdev->regs) { - dev_err(&op->dev, "unable to ioremap registers\n"); - err = -ENOMEM; - goto out_free; - } + if (!fdev->regs) + return dev_err_probe(&op->dev, -ENOMEM, "unable to ioremap registers\n"); /* map the channel IRQ if it exists, but don't hookup the handler yet */ fdev->irq = platform_get_irq_optional(op, 0);
@@ -1325,9 +1321,6 @@ static int fsldma_of_probe(struct platform_device *op) } out_iounmap: iounmap(fdev->regs); -out_free: - kfree(fdev); -out_return: return err; }
@@ -1361,7 +1354,6 @@ static void fsldma_of_remove(struct platform_device *op) } iounmap(fdev->regs); - kfree(fdev); } #ifdef CONFIG_PM
--
2.54.0