From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: dmaengine: tegra210-adma: Use struct_size() in devm_kzalloc() From: "Gustavo A. R. Silva" Message-Id: <20190107170631.GA32119@embeddedor> Date: Mon, 7 Jan 2019 11:06:31 -0600 To: Laxman Dewangan , Jon Hunter , Dan Williams , Vinod Koul , Thierry Reding Cc: dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" List-ID: T25lIG9mIHRoZSBtb3JlIGNvbW1vbiBjYXNlcyBvZiBhbGxvY2F0aW9uIHNpemUgY2FsY3VsYXRp b25zIGlzIGZpbmRpbmcKdGhlIHNpemUgb2YgYSBzdHJ1Y3R1cmUgdGhhdCBoYXMgYSB6ZXJvLXNp emVkIGFycmF5IGF0IHRoZSBlbmQsIGFsb25nCndpdGggbWVtb3J5IGZvciBzb21lIG51bWJlciBv ZiBlbGVtZW50cyBmb3IgdGhhdCBhcnJheS4gRm9yIGV4YW1wbGU6CgpzdHJ1Y3QgZm9vIHsKICAg IGludCBzdHVmZjsKICAgIHZvaWQgKmVudHJ5W107Cn07CgppbnN0YW5jZSA9IGRldm1fa3phbGxv YyhkZXYsIHNpemVvZihzdHJ1Y3QgZm9vKSArIHNpemVvZih2b2lkICopICogY291bnQsIEdGUF9L RVJORUwpOwoKSW5zdGVhZCBvZiBsZWF2aW5nIHRoZXNlIG9wZW4tY29kZWQgYW5kIHByb25lIHRv IHR5cGUgbWlzdGFrZXMsIHdlIGNhbgpub3cgdXNlIHRoZSBuZXcgc3RydWN0X3NpemUoKSBoZWxw ZXI6CgppbnN0YW5jZSA9IGRldm1fa3phbGxvYyhkZXYsIHN0cnVjdF9zaXplKGluc3RhbmNlLCBl bnRyeSwgY291bnQpLCBHRlBfS0VSTkVMKTsKClRoaXMgY29kZSB3YXMgZGV0ZWN0ZWQgd2l0aCB0 aGUgaGVscCBvZiBDb2NjaW5lbGxlLgoKU2lnbmVkLW9mZi1ieTogR3VzdGF2byBBLiBSLiBTaWx2 YSA8Z3VzdGF2b0BlbWJlZGRlZG9yLmNvbT4KLS0tCiBkcml2ZXJzL2RtYS90ZWdyYTIxMC1hZG1h LmMgfCA1ICsrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hL3RlZ3JhMjEwLWFkbWEuYyBiL2RyaXZlcnMv ZG1hL3RlZ3JhMjEwLWFkbWEuYwppbmRleCBiMjYyNTZmMjNkNjcuLjVlYzBkZDk3YjM5NyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9kbWEvdGVncmEyMTAtYWRtYS5jCisrKyBiL2RyaXZlcnMvZG1hL3Rl Z3JhMjEwLWFkbWEuYwpAQCAtNjc4LDggKzY3OCw5IEBAIHN0YXRpYyBpbnQgdGVncmFfYWRtYV9w cm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCQlyZXR1cm4gLUVOT0RFVjsKIAl9 CiAKLQl0ZG1hID0gZGV2bV9remFsbG9jKCZwZGV2LT5kZXYsIHNpemVvZigqdGRtYSkgKyBjZGF0 YS0+bnJfY2hhbm5lbHMgKgotCQkJICAgIHNpemVvZihzdHJ1Y3QgdGVncmFfYWRtYV9jaGFuKSwg R0ZQX0tFUk5FTCk7CisJdGRtYSA9IGRldm1fa3phbGxvYygmcGRldi0+ZGV2LAorCQkJICAgIHN0 cnVjdF9zaXplKHRkbWEsIGNoYW5uZWxzLCBjZGF0YS0+bnJfY2hhbm5lbHMpLAorCQkJICAgIEdG UF9LRVJORUwpOwogCWlmICghdGRtYSkKIAkJcmV0dXJuIC1FTk9NRU07CiAK From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Gustavo A. R. Silva" Subject: [PATCH] dmaengine: tegra210-adma: Use struct_size() in devm_kzalloc() Date: Mon, 7 Jan 2019 11:06:31 -0600 Message-ID: <20190107170631.GA32119@embeddedor> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org To: Laxman Dewangan , Jon Hunter , Dan Williams , Vinod Koul , Thierry Reding Cc: dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" List-Id: linux-tegra@vger.kernel.org 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 --- drivers/dma/tegra210-adma.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c index b26256f23d67..5ec0dd97b397 100644 --- a/drivers/dma/tegra210-adma.c +++ b/drivers/dma/tegra210-adma.c @@ -678,8 +678,9 @@ static int tegra_adma_probe(struct platform_device *pdev) return -ENODEV; } - tdma = devm_kzalloc(&pdev->dev, sizeof(*tdma) + cdata->nr_channels * - sizeof(struct tegra_adma_chan), GFP_KERNEL); + tdma = devm_kzalloc(&pdev->dev, + struct_size(tdma, channels, cdata->nr_channels), + GFP_KERNEL); if (!tdma) return -ENOMEM; -- 2.20.1