Commit b744c3bc authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Marc Zyngier

irqchip/qcom: 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;
    struct boo entry[];
};

size = sizeof(struct foo) + count * sizeof(struct boo);
instance = devm_kzalloc(dev, size, 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);

Notice that, in this case, variable alloc_sz is not necessary, hence it
is removed.

This code was detected with the help of Coccinelle.
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent e85c9c90
...@@ -237,7 +237,6 @@ static int get_registers(struct platform_device *pdev, struct combiner *comb) ...@@ -237,7 +237,6 @@ static int get_registers(struct platform_device *pdev, struct combiner *comb)
static int __init combiner_probe(struct platform_device *pdev) static int __init combiner_probe(struct platform_device *pdev)
{ {
struct combiner *combiner; struct combiner *combiner;
size_t alloc_sz;
int nregs; int nregs;
int err; int err;
...@@ -247,8 +246,8 @@ static int __init combiner_probe(struct platform_device *pdev) ...@@ -247,8 +246,8 @@ static int __init combiner_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
alloc_sz = sizeof(*combiner) + sizeof(struct combiner_reg) * nregs; combiner = devm_kzalloc(&pdev->dev, struct_size(combiner, regs, nregs),
combiner = devm_kzalloc(&pdev->dev, alloc_sz, GFP_KERNEL); GFP_KERNEL);
if (!combiner) if (!combiner)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment