mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 05:31:37 -04:00
mailbox: hi6220: kzalloc + kcalloc to kzalloc
Reduce allocations to a single one by using a flexible array member. Allows using __counted_by for extra runtime analysis. Signed-off-by: Rosen Penev <rosenp@gmail.com> Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>
This commit is contained in:
@@ -79,12 +79,12 @@ struct hi6220_mbox {
|
||||
/* region for mailbox */
|
||||
void __iomem *base;
|
||||
|
||||
unsigned int chan_num;
|
||||
struct hi6220_mbox_chan *mchan;
|
||||
|
||||
void *irq_map_chan[MBOX_CHAN_MAX];
|
||||
struct mbox_chan *chan;
|
||||
struct mbox_controller controller;
|
||||
|
||||
unsigned int chan_num;
|
||||
struct hi6220_mbox_chan mchan[] __counted_by(chan_num);
|
||||
};
|
||||
|
||||
static void mbox_set_state(struct hi6220_mbox *mbox,
|
||||
@@ -267,16 +267,12 @@ static int hi6220_mbox_probe(struct platform_device *pdev)
|
||||
struct hi6220_mbox *mbox;
|
||||
int i, err;
|
||||
|
||||
mbox = devm_kzalloc(dev, sizeof(*mbox), GFP_KERNEL);
|
||||
mbox = devm_kzalloc(dev, struct_size(mbox, mchan, MBOX_CHAN_MAX), GFP_KERNEL);
|
||||
if (!mbox)
|
||||
return -ENOMEM;
|
||||
|
||||
mbox->dev = dev;
|
||||
mbox->chan_num = MBOX_CHAN_MAX;
|
||||
mbox->mchan = devm_kcalloc(dev,
|
||||
mbox->chan_num, sizeof(*mbox->mchan), GFP_KERNEL);
|
||||
if (!mbox->mchan)
|
||||
return -ENOMEM;
|
||||
mbox->dev = dev;
|
||||
|
||||
mbox->chan = devm_kcalloc(dev,
|
||||
mbox->chan_num, sizeof(*mbox->chan), GFP_KERNEL);
|
||||
|
||||
Reference in New Issue
Block a user