staging: mt7621-dma: Use struct_size() in devm_kzalloc()

One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:

struct foo {
    int stuff;
    void *entry[];
};

instance = devm_kzalloc(dev, sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL);

Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:

instance = devm_kzalloc(dev, struct_size(instance, entry, count), GFP_KERNEL);

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/mt7621-dma/ralink-gdma.c b/drivers/staging/mt7621-dma/ralink-gdma.c
index 792a63bd55d4a148f3571e22c4762816327175fb..d78042eba6dd2b471ae2e7c7c1a43f37bf62211f 100644 (file)
--- a/drivers/staging/mt7621-dma/ralink-gdma.c
+++ b/drivers/staging/mt7621-dma/ralink-gdma.c
@@ -821,9 +821,9 @@ static int gdma_dma_probe(struct platform_device *pdev)
                return -EINVAL;
        data = (struct gdma_data *) match->data;
 
-       dma_dev = devm_kzalloc(&pdev->dev, sizeof(*dma_dev) +
-                       (sizeof(struct gdma_dmaengine_chan) * data->chancnt),
-                       GFP_KERNEL);
+       dma_dev = devm_kzalloc(&pdev->dev,
+                              struct_size(dma_dev, chan, data->chancnt),
+                              GFP_KERNEL);
        if (!dma_dev) {
                dev_err(&pdev->dev, "alloc dma device failed\n");
                return -EINVAL;