comedi: isadma: use kzalloc_flex

Switched struct pointer member to a flexible array member to get rid of
kzalloc_objs as there's no need for them to be separately allocated.

AAdded __counted_by for extra runtime analysis.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20260311232459.18407-1-rosenp@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/comedi/drivers/comedi_isadma.c b/drivers/comedi/drivers/comedi_isadma.c
index f480640413f0b879795a6fa16117d0e02aef3cbd..b346079b9b6bc8793fabb604e519568b54b099c0 100644 (file)
--- a/drivers/comedi/drivers/comedi_isadma.c
+++ b/drivers/comedi/drivers/comedi_isadma.c
@@ -161,14 +161,10 @@ struct comedi_isadma *comedi_isadma_alloc(struct comedi_device *dev,
        if (n_desc < 1 || n_desc > 2)
                goto no_dma;
 
-       dma = kzalloc_obj(*dma);
+       dma = kzalloc_flex(*dma, desc, n_desc);
        if (!dma)
                goto no_dma;
 
-       desc = kzalloc_objs(*desc, n_desc);
-       if (!desc)
-               goto no_dma;
-       dma->desc = desc;
        dma->n_desc = n_desc;
        if (dev->hw_dev) {
                dma->dev = dev->hw_dev;
@@ -231,15 +227,12 @@ void comedi_isadma_free(struct comedi_isadma *dma)
        if (!dma)
                return;
 
-       if (dma->desc) {
-               for (i = 0; i < dma->n_desc; i++) {
-                       desc = &dma->desc[i];
-                       if (desc->virt_addr)
-                               dma_free_coherent(dma->dev, desc->maxsize,
-                                                 desc->virt_addr,
-                                                 desc->hw_addr);
-               }
-               kfree(dma->desc);
+       for (i = 0; i < dma->n_desc; i++) {
+               desc = &dma->desc[i];
+               if (desc->virt_addr)
+                       dma_free_coherent(dma->dev, desc->maxsize,
+                                         desc->virt_addr,
+                                         desc->hw_addr);
        }
        if (dma->chan2 && dma->chan2 != dma->chan)
                free_dma(dma->chan2);

diff --git a/include/linux/comedi/comedi_isadma.h b/include/linux/comedi/comedi_isadma.h
index 9d2b12db7e6e3f5bb8100fe88b2c3177244a87da..7514ce222fa6dcce99955e24bb0aecdd5e96575e 100644 (file)
--- a/include/linux/comedi/comedi_isadma.h
+++ b/include/linux/comedi/comedi_isadma.h
@@ -48,11 +48,11 @@ struct comedi_isadma_desc {
  */
 struct comedi_isadma {
        struct device *dev;
-       struct comedi_isadma_desc *desc;
        int n_desc;
        int cur_dma;
        unsigned int chan;
        unsigned int chan2;
+       struct comedi_isadma_desc desc[] __counted_by(n_desc);
 };
 
 #if IS_ENABLED(CONFIG_ISA_DMA_API)