treewide: devm_kzalloc() -> devm_kcalloc()
The devm_kzalloc() function has a 2-factor argument form, devm_kcalloc(). This patch replaces cases of: devm_kzalloc(handle, a * b, gfp) with: devm_kcalloc(handle, a * b, gfp) as well as handling cases of: devm_kzalloc(handle, a * b * c, gfp) with: devm_kzalloc(handle, array3_size(a, b, c), gfp) as it's slightly less ugly than: devm_kcalloc(handle, array_size(a, b), c, gfp) This does, however, attempt to ignore constant size factors like: devm_kzalloc(handle, 4 * 1024, gfp) though any constants defined via macros get caught up in the conversion. Any factors with a sizeof() of "unsigned char", "char", and "u8" were dropped, since they're redundant. Some manual whitespace fixes were needed in this patch, as Coccinelle really liked to write "=devm_kcalloc..." instead of "= devm_kcalloc...". The Coccinelle script used for this was: // Fix redundant parens around sizeof(). @@ expression HANDLE; type TYPE; expression THING, E; @@ ( devm_kzalloc(HANDLE, - (sizeof(TYPE)) * E + sizeof(TYPE) * E , ...) | devm_kzalloc(HANDLE, - (sizeof(THING)) * E + sizeof(THING) * E , ...) ) // Drop single-byte sizes and redundant parens. @@ expression HANDLE; expression COUNT; typedef u8; typedef __u8; @@ ( devm_kzalloc(HANDLE, - sizeof(u8) * (COUNT) + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(__u8) * (COUNT) + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(char) * (COUNT) + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(unsigned char) * (COUNT) + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(u8) * COUNT + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(__u8) * COUNT + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(char) * COUNT + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(unsigned char) * COUNT + COUNT , ...) ) // 2-factor product with sizeof(type/expression) and identifier or constant. @@ expression HANDLE; type TYPE; expression THING; identifier COUNT_ID; constant COUNT_CONST; @@ ( - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * (COUNT_ID) + COUNT_ID, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * COUNT_ID + COUNT_ID, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * (COUNT_CONST) + COUNT_CONST, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * COUNT_CONST + COUNT_CONST, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * (COUNT_ID) + COUNT_ID, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * COUNT_ID + COUNT_ID, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * (COUNT_CONST) + COUNT_CONST, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * COUNT_CONST + COUNT_CONST, sizeof(THING) , ...) ) // 2-factor product, only identifiers. @@ expression HANDLE; identifier SIZE, COUNT; @@ - devm_kzalloc + devm_kcalloc (HANDLE, - SIZE * COUNT + COUNT, SIZE , ...) // 3-factor product with 1 sizeof(type) or sizeof(expression), with // redundant parens removed. @@ expression HANDLE; expression THING; identifier STRIDE, COUNT; type TYPE; @@ ( devm_kzalloc(HANDLE, - sizeof(TYPE) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) ) // 3-factor product with 2 sizeof(variable), with redundant parens removed. @@ expression HANDLE; expression THING1, THING2; identifier COUNT; type TYPE1, TYPE2; @@ ( devm_kzalloc(HANDLE, - sizeof(TYPE1) * sizeof(TYPE2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) ) // 3-factor product, only identifiers, with redundant parens removed. @@ expression HANDLE; identifier STRIDE, SIZE, COUNT; @@ ( devm_kzalloc(HANDLE, - (COUNT) * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - COUNT * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - COUNT * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - (COUNT) * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - COUNT * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - (COUNT) * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - (COUNT) * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - COUNT * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) ) // Any remaining multi-factor products, first at least 3-factor products, // when they're not all constants... @@ expression HANDLE; expression E1, E2, E3; constant C1, C2, C3; @@ ( devm_kzalloc(HANDLE, C1 * C2 * C3, ...) | devm_kzalloc(HANDLE, - (E1) * E2 * E3 + array3_size(E1, E2, E3) , ...) | devm_kzalloc(HANDLE, - (E1) * (E2) * E3 + array3_size(E1, E2, E3) , ...) | devm_kzalloc(HANDLE, - (E1) * (E2) * (E3) + array3_size(E1, E2, E3) , ...) | devm_kzalloc(HANDLE, - E1 * E2 * E3 + array3_size(E1, E2, E3) , ...) ) // And then all remaining 2 factors products when they're not all constants, // keeping sizeof() as the second factor argument. @@ expression HANDLE; expression THING, E1, E2; type TYPE; constant C1, C2, C3; @@ ( devm_kzalloc(HANDLE, sizeof(THING) * C2, ...) | devm_kzalloc(HANDLE, sizeof(TYPE) * C2, ...) | devm_kzalloc(HANDLE, C1 * C2 * C3, ...) | devm_kzalloc(HANDLE, C1 * C2, ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * (E2) + E2, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * E2 + E2, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * (E2) + E2, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * E2 + E2, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - (E1) * E2 + E1, E2 , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - (E1) * (E2) + E1, E2 , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - E1 * E2 + E1, E2 , ...) ) Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
parent
3c4211ba8a
commit
a86854d0c5
@ -298,8 +298,8 @@ static int acpi_fan_get_fps(struct acpi_device *device)
|
||||
}
|
||||
|
||||
fan->fps_count = obj->package.count - 1; /* minus revision field */
|
||||
fan->fps = devm_kzalloc(&device->dev,
|
||||
fan->fps_count * sizeof(struct acpi_fan_fps),
|
||||
fan->fps = devm_kcalloc(&device->dev,
|
||||
fan->fps_count, sizeof(struct acpi_fan_fps),
|
||||
GFP_KERNEL);
|
||||
if (!fan->fps) {
|
||||
dev_err(&device->dev, "Not enough memory\n");
|
||||
|
@ -1082,9 +1082,10 @@ static int __nfit_mem_init(struct acpi_nfit_desc *acpi_desc,
|
||||
continue;
|
||||
nfit_mem->nfit_flush = nfit_flush;
|
||||
flush = nfit_flush->flush;
|
||||
nfit_mem->flush_wpq = devm_kzalloc(acpi_desc->dev,
|
||||
flush->hint_count
|
||||
* sizeof(struct resource), GFP_KERNEL);
|
||||
nfit_mem->flush_wpq = devm_kcalloc(acpi_desc->dev,
|
||||
flush->hint_count,
|
||||
sizeof(struct resource),
|
||||
GFP_KERNEL);
|
||||
if (!nfit_mem->flush_wpq)
|
||||
return -ENOMEM;
|
||||
for (i = 0; i < flush->hint_count; i++) {
|
||||
|
@ -4114,13 +4114,13 @@ static int mv_platform_probe(struct platform_device *pdev)
|
||||
|
||||
if (!host || !hpriv)
|
||||
return -ENOMEM;
|
||||
hpriv->port_clks = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct clk *) * n_ports,
|
||||
hpriv->port_clks = devm_kcalloc(&pdev->dev,
|
||||
n_ports, sizeof(struct clk *),
|
||||
GFP_KERNEL);
|
||||
if (!hpriv->port_clks)
|
||||
return -ENOMEM;
|
||||
hpriv->port_phys = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct phy *) * n_ports,
|
||||
hpriv->port_phys = devm_kcalloc(&pdev->dev,
|
||||
n_ports, sizeof(struct phy *),
|
||||
GFP_KERNEL);
|
||||
if (!hpriv->port_phys)
|
||||
return -ENOMEM;
|
||||
|
@ -354,8 +354,8 @@ int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus,
|
||||
if (error < 0)
|
||||
return error;
|
||||
|
||||
irq_resources = devm_kzalloc(&mc_bus_dev->dev,
|
||||
sizeof(*irq_resources) * irq_count,
|
||||
irq_resources = devm_kcalloc(&mc_bus_dev->dev,
|
||||
irq_count, sizeof(*irq_resources),
|
||||
GFP_KERNEL);
|
||||
if (!irq_resources) {
|
||||
error = -ENOMEM;
|
||||
@ -455,7 +455,7 @@ int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev)
|
||||
return -ENOSPC;
|
||||
}
|
||||
|
||||
irqs = devm_kzalloc(&mc_dev->dev, irq_count * sizeof(irqs[0]),
|
||||
irqs = devm_kcalloc(&mc_dev->dev, irq_count, sizeof(irqs[0]),
|
||||
GFP_KERNEL);
|
||||
if (!irqs)
|
||||
return -ENOMEM;
|
||||
|
@ -980,7 +980,7 @@ static int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip)
|
||||
goto out;
|
||||
}
|
||||
|
||||
chip->cc_attrs_tbl = devm_kzalloc(&chip->dev, 4 * nr_commands,
|
||||
chip->cc_attrs_tbl = devm_kcalloc(&chip->dev, 4, nr_commands,
|
||||
GFP_KERNEL);
|
||||
|
||||
rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_GET_CAPABILITY);
|
||||
|
@ -734,7 +734,7 @@ static void bcm2835_pll_debug_init(struct clk_hw *hw,
|
||||
const struct bcm2835_pll_data *data = pll->data;
|
||||
struct debugfs_reg32 *regs;
|
||||
|
||||
regs = devm_kzalloc(cprman->dev, 7 * sizeof(*regs), GFP_KERNEL);
|
||||
regs = devm_kcalloc(cprman->dev, 7, sizeof(*regs), GFP_KERNEL);
|
||||
if (!regs)
|
||||
return;
|
||||
|
||||
@ -865,7 +865,7 @@ static void bcm2835_pll_divider_debug_init(struct clk_hw *hw,
|
||||
const struct bcm2835_pll_divider_data *data = divider->data;
|
||||
struct debugfs_reg32 *regs;
|
||||
|
||||
regs = devm_kzalloc(cprman->dev, 7 * sizeof(*regs), GFP_KERNEL);
|
||||
regs = devm_kcalloc(cprman->dev, 7, sizeof(*regs), GFP_KERNEL);
|
||||
if (!regs)
|
||||
return;
|
||||
|
||||
|
@ -501,8 +501,9 @@ static int ti_adpll_init_dco(struct ti_adpll_data *d)
|
||||
const char *postfix;
|
||||
int width, err;
|
||||
|
||||
d->outputs.clks = devm_kzalloc(d->dev, sizeof(struct clk *) *
|
||||
d->outputs.clks = devm_kcalloc(d->dev,
|
||||
MAX_ADPLL_OUTPUTS,
|
||||
sizeof(struct clk *),
|
||||
GFP_KERNEL);
|
||||
if (!d->outputs.clks)
|
||||
return -ENOMEM;
|
||||
@ -915,8 +916,9 @@ static int ti_adpll_probe(struct platform_device *pdev)
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
d->clocks = devm_kzalloc(d->dev, sizeof(struct ti_adpll_clock) *
|
||||
d->clocks = devm_kcalloc(d->dev,
|
||||
TI_ADPLL_NR_CLOCKS,
|
||||
sizeof(struct ti_adpll_clock),
|
||||
GFP_KERNEL);
|
||||
if (!d->clocks)
|
||||
return -ENOMEM;
|
||||
|
@ -410,7 +410,7 @@ brcm_avs_get_freq_table(struct device *dev, struct private_data *priv)
|
||||
if (ret)
|
||||
return ERR_PTR(ret);
|
||||
|
||||
table = devm_kzalloc(dev, (AVS_PSTATE_MAX + 1) * sizeof(*table),
|
||||
table = devm_kcalloc(dev, AVS_PSTATE_MAX + 1, sizeof(*table),
|
||||
GFP_KERNEL);
|
||||
if (!table)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
@ -377,7 +377,8 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
/* Make imx6_soc_volt array's size same as arm opp number */
|
||||
imx6_soc_volt = devm_kzalloc(cpu_dev, sizeof(*imx6_soc_volt) * num, GFP_KERNEL);
|
||||
imx6_soc_volt = devm_kcalloc(cpu_dev, num, sizeof(*imx6_soc_volt),
|
||||
GFP_KERNEL);
|
||||
if (imx6_soc_volt == NULL) {
|
||||
ret = -ENOMEM;
|
||||
goto free_freq_table;
|
||||
|
@ -471,7 +471,7 @@ static int mv_cesa_probe(struct platform_device *pdev)
|
||||
sram_size = CESA_SA_MIN_SRAM_SIZE;
|
||||
|
||||
cesa->sram_size = sram_size;
|
||||
cesa->engines = devm_kzalloc(dev, caps->nengines * sizeof(*engines),
|
||||
cesa->engines = devm_kcalloc(dev, caps->nengines, sizeof(*engines),
|
||||
GFP_KERNEL);
|
||||
if (!cesa->engines)
|
||||
return -ENOMEM;
|
||||
|
@ -3393,8 +3393,10 @@ static int talitos_probe(struct platform_device *ofdev)
|
||||
}
|
||||
}
|
||||
|
||||
priv->chan = devm_kzalloc(dev, sizeof(struct talitos_channel) *
|
||||
priv->num_channels, GFP_KERNEL);
|
||||
priv->chan = devm_kcalloc(dev,
|
||||
priv->num_channels,
|
||||
sizeof(struct talitos_channel),
|
||||
GFP_KERNEL);
|
||||
if (!priv->chan) {
|
||||
dev_err(dev, "failed to allocate channel management space\n");
|
||||
err = -ENOMEM;
|
||||
@ -3411,9 +3413,10 @@ static int talitos_probe(struct platform_device *ofdev)
|
||||
spin_lock_init(&priv->chan[i].head_lock);
|
||||
spin_lock_init(&priv->chan[i].tail_lock);
|
||||
|
||||
priv->chan[i].fifo = devm_kzalloc(dev,
|
||||
sizeof(struct talitos_request) *
|
||||
priv->fifo_len, GFP_KERNEL);
|
||||
priv->chan[i].fifo = devm_kcalloc(dev,
|
||||
priv->fifo_len,
|
||||
sizeof(struct talitos_request),
|
||||
GFP_KERNEL);
|
||||
if (!priv->chan[i].fifo) {
|
||||
dev_err(dev, "failed to allocate request fifo %d\n", i);
|
||||
err = -ENOMEM;
|
||||
|
@ -628,14 +628,15 @@ struct devfreq *devfreq_add_device(struct device *dev,
|
||||
goto err_dev;
|
||||
}
|
||||
|
||||
devfreq->trans_table = devm_kzalloc(&devfreq->dev,
|
||||
sizeof(unsigned int) *
|
||||
devfreq->profile->max_state *
|
||||
devfreq->profile->max_state,
|
||||
GFP_KERNEL);
|
||||
devfreq->time_in_state = devm_kzalloc(&devfreq->dev,
|
||||
sizeof(unsigned long) *
|
||||
devfreq->trans_table =
|
||||
devm_kzalloc(&devfreq->dev,
|
||||
array3_size(sizeof(unsigned int),
|
||||
devfreq->profile->max_state,
|
||||
devfreq->profile->max_state),
|
||||
GFP_KERNEL);
|
||||
devfreq->time_in_state = devm_kcalloc(&devfreq->dev,
|
||||
devfreq->profile->max_state,
|
||||
sizeof(unsigned long),
|
||||
GFP_KERNEL);
|
||||
devfreq->last_stat_updated = jiffies;
|
||||
|
||||
|
@ -518,7 +518,7 @@ static int of_get_devfreq_events(struct device_node *np,
|
||||
event_ops = exynos_bus_get_ops(np);
|
||||
|
||||
count = of_get_child_count(events_np);
|
||||
desc = devm_kzalloc(dev, sizeof(*desc) * count, GFP_KERNEL);
|
||||
desc = devm_kcalloc(dev, count, sizeof(*desc), GFP_KERNEL);
|
||||
if (!desc)
|
||||
return -ENOMEM;
|
||||
info->num_events = count;
|
||||
|
@ -848,8 +848,8 @@ static int k3_dma_probe(struct platform_device *op)
|
||||
return -ENOMEM;
|
||||
|
||||
/* init phy channel */
|
||||
d->phy = devm_kzalloc(&op->dev,
|
||||
d->dma_channels * sizeof(struct k3_dma_phy), GFP_KERNEL);
|
||||
d->phy = devm_kcalloc(&op->dev,
|
||||
d->dma_channels, sizeof(struct k3_dma_phy), GFP_KERNEL);
|
||||
if (d->phy == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -879,8 +879,8 @@ static int k3_dma_probe(struct platform_device *op)
|
||||
d->slave.copy_align = DMAENGINE_ALIGN_8_BYTES;
|
||||
|
||||
/* init virtual channel */
|
||||
d->chans = devm_kzalloc(&op->dev,
|
||||
d->dma_requests * sizeof(struct k3_dma_chan), GFP_KERNEL);
|
||||
d->chans = devm_kcalloc(&op->dev,
|
||||
d->dma_requests, sizeof(struct k3_dma_chan), GFP_KERNEL);
|
||||
if (d->chans == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -809,8 +809,9 @@ static int mv_xor_v2_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
/* alloc memory for the SW descriptors */
|
||||
xor_dev->sw_desq = devm_kzalloc(&pdev->dev, sizeof(*sw_desc) *
|
||||
MV_XOR_V2_DESC_NUM, GFP_KERNEL);
|
||||
xor_dev->sw_desq = devm_kcalloc(&pdev->dev,
|
||||
MV_XOR_V2_DESC_NUM, sizeof(*sw_desc),
|
||||
GFP_KERNEL);
|
||||
if (!xor_dev->sw_desq) {
|
||||
ret = -ENOMEM;
|
||||
goto free_hw_desq;
|
||||
|
@ -1223,9 +1223,9 @@ static int s3c24xx_dma_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(s3cdma->base))
|
||||
return PTR_ERR(s3cdma->base);
|
||||
|
||||
s3cdma->phy_chans = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct s3c24xx_dma_phy) *
|
||||
pdata->num_phy_channels,
|
||||
s3cdma->phy_chans = devm_kcalloc(&pdev->dev,
|
||||
pdata->num_phy_channels,
|
||||
sizeof(struct s3c24xx_dma_phy),
|
||||
GFP_KERNEL);
|
||||
if (!s3cdma->phy_chans)
|
||||
return -ENOMEM;
|
||||
|
@ -798,8 +798,8 @@ static int zx_dma_probe(struct platform_device *op)
|
||||
return -ENOMEM;
|
||||
|
||||
/* init phy channel */
|
||||
d->phy = devm_kzalloc(&op->dev,
|
||||
d->dma_channels * sizeof(struct zx_dma_phy), GFP_KERNEL);
|
||||
d->phy = devm_kcalloc(&op->dev,
|
||||
d->dma_channels, sizeof(struct zx_dma_phy), GFP_KERNEL);
|
||||
if (!d->phy)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -834,8 +834,8 @@ static int zx_dma_probe(struct platform_device *op)
|
||||
d->slave.residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT;
|
||||
|
||||
/* init virtual channel */
|
||||
d->chans = devm_kzalloc(&op->dev,
|
||||
d->dma_requests * sizeof(struct zx_dma_chan), GFP_KERNEL);
|
||||
d->chans = devm_kcalloc(&op->dev,
|
||||
d->dma_requests, sizeof(struct zx_dma_chan), GFP_KERNEL);
|
||||
if (!d->chans)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -890,7 +890,7 @@ static int scpi_alloc_xfer_list(struct device *dev, struct scpi_chan *ch)
|
||||
int i;
|
||||
struct scpi_xfer *xfers;
|
||||
|
||||
xfers = devm_kzalloc(dev, MAX_SCPI_XFERS * sizeof(*xfers), GFP_KERNEL);
|
||||
xfers = devm_kcalloc(dev, MAX_SCPI_XFERS, sizeof(*xfers), GFP_KERNEL);
|
||||
if (!xfers)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -1862,9 +1862,9 @@ static int ti_sci_probe(struct platform_device *pdev)
|
||||
if (!minfo->xfer_block)
|
||||
return -ENOMEM;
|
||||
|
||||
minfo->xfer_alloc_table = devm_kzalloc(dev,
|
||||
BITS_TO_LONGS(desc->max_msgs)
|
||||
* sizeof(unsigned long),
|
||||
minfo->xfer_alloc_table = devm_kcalloc(dev,
|
||||
BITS_TO_LONGS(desc->max_msgs),
|
||||
sizeof(unsigned long),
|
||||
GFP_KERNEL);
|
||||
if (!minfo->xfer_alloc_table)
|
||||
return -ENOMEM;
|
||||
|
@ -427,7 +427,7 @@ static int adnp_irq_setup(struct adnp *adnp)
|
||||
* is chosen to match the register layout of the hardware in that
|
||||
* each segment contains the corresponding bits for all interrupts.
|
||||
*/
|
||||
adnp->irq_enable = devm_kzalloc(chip->parent, num_regs * 6,
|
||||
adnp->irq_enable = devm_kcalloc(chip->parent, num_regs, 6,
|
||||
GFP_KERNEL);
|
||||
if (!adnp->irq_enable)
|
||||
return -ENOMEM;
|
||||
|
@ -897,8 +897,8 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
|
||||
|
||||
/* Allocate a cache of the output registers */
|
||||
banks = gpio->config->nr_gpios >> 5;
|
||||
gpio->dcache = devm_kzalloc(&pdev->dev,
|
||||
sizeof(u32) * banks, GFP_KERNEL);
|
||||
gpio->dcache = devm_kcalloc(&pdev->dev,
|
||||
banks, sizeof(u32), GFP_KERNEL);
|
||||
if (!gpio->dcache)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -601,9 +601,10 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)
|
||||
GPIO_MAX_BANK_NUM);
|
||||
return -ENXIO;
|
||||
}
|
||||
kona_gpio->banks = devm_kzalloc(dev,
|
||||
kona_gpio->num_bank *
|
||||
sizeof(*kona_gpio->banks), GFP_KERNEL);
|
||||
kona_gpio->banks = devm_kcalloc(dev,
|
||||
kona_gpio->num_bank,
|
||||
sizeof(*kona_gpio->banks),
|
||||
GFP_KERNEL);
|
||||
if (!kona_gpio->banks)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -198,8 +198,8 @@ static int davinci_gpio_probe(struct platform_device *pdev)
|
||||
ngpio = ARCH_NR_GPIOS;
|
||||
|
||||
nbank = DIV_ROUND_UP(ngpio, 32);
|
||||
chips = devm_kzalloc(dev,
|
||||
nbank * sizeof(struct davinci_gpio_controller),
|
||||
chips = devm_kcalloc(dev,
|
||||
nbank, sizeof(struct davinci_gpio_controller),
|
||||
GFP_KERNEL);
|
||||
if (!chips)
|
||||
return -ENOMEM;
|
||||
|
@ -321,8 +321,8 @@ static int __init egpio_probe(struct platform_device *pdev)
|
||||
platform_set_drvdata(pdev, ei);
|
||||
|
||||
ei->nchips = pdata->num_chips;
|
||||
ei->chip = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct egpio_chip) * ei->nchips,
|
||||
ei->chip = devm_kcalloc(&pdev->dev,
|
||||
ei->nchips, sizeof(struct egpio_chip),
|
||||
GFP_KERNEL);
|
||||
if (!ei->chip) {
|
||||
ret = -ENOMEM;
|
||||
|
@ -504,16 +504,17 @@ static int thunderx_gpio_probe(struct pci_dev *pdev,
|
||||
txgpio->base_msi = (c >> 8) & 0xff;
|
||||
}
|
||||
|
||||
txgpio->msix_entries = devm_kzalloc(dev,
|
||||
sizeof(struct msix_entry) * ngpio,
|
||||
txgpio->msix_entries = devm_kcalloc(dev,
|
||||
ngpio, sizeof(struct msix_entry),
|
||||
GFP_KERNEL);
|
||||
if (!txgpio->msix_entries) {
|
||||
err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
txgpio->line_entries = devm_kzalloc(dev,
|
||||
sizeof(struct thunderx_line) * ngpio,
|
||||
txgpio->line_entries = devm_kcalloc(dev,
|
||||
ngpio,
|
||||
sizeof(struct thunderx_line),
|
||||
GFP_KERNEL);
|
||||
if (!txgpio->line_entries) {
|
||||
err = -ENOMEM;
|
||||
|
@ -1723,8 +1723,8 @@ static int exynos_dsi_probe(struct platform_device *pdev)
|
||||
return -EPROBE_DEFER;
|
||||
}
|
||||
|
||||
dsi->clks = devm_kzalloc(dev,
|
||||
sizeof(*dsi->clks) * dsi->driver_data->num_clks,
|
||||
dsi->clks = devm_kcalloc(dev,
|
||||
dsi->driver_data->num_clks, sizeof(*dsi->clks),
|
||||
GFP_KERNEL);
|
||||
if (!dsi->clks)
|
||||
return -ENOMEM;
|
||||
|
@ -1271,7 +1271,8 @@ static int fimc_probe(struct platform_device *pdev)
|
||||
|
||||
/* construct formats/limits array */
|
||||
num_formats = ARRAY_SIZE(fimc_formats) + ARRAY_SIZE(fimc_tiled_formats);
|
||||
formats = devm_kzalloc(dev, sizeof(*formats) * num_formats, GFP_KERNEL);
|
||||
formats = devm_kcalloc(dev, num_formats, sizeof(*formats),
|
||||
GFP_KERNEL);
|
||||
if (!formats)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -1202,8 +1202,9 @@ static int gsc_probe(struct platform_device *pdev)
|
||||
if (!ctx)
|
||||
return -ENOMEM;
|
||||
|
||||
formats = devm_kzalloc(dev, sizeof(*formats) *
|
||||
(ARRAY_SIZE(gsc_formats)), GFP_KERNEL);
|
||||
formats = devm_kcalloc(dev,
|
||||
ARRAY_SIZE(gsc_formats), sizeof(*formats),
|
||||
GFP_KERNEL);
|
||||
if (!formats)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -1692,7 +1692,7 @@ static int hdmi_clk_init(struct hdmi_context *hdata)
|
||||
if (!count)
|
||||
return 0;
|
||||
|
||||
clks = devm_kzalloc(dev, sizeof(*clks) * count, GFP_KERNEL);
|
||||
clks = devm_kcalloc(dev, count, sizeof(*clks), GFP_KERNEL);
|
||||
if (!clks)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -157,8 +157,10 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
|
||||
hdmi->qfprom_mmio = NULL;
|
||||
}
|
||||
|
||||
hdmi->hpd_regs = devm_kzalloc(&pdev->dev, sizeof(hdmi->hpd_regs[0]) *
|
||||
config->hpd_reg_cnt, GFP_KERNEL);
|
||||
hdmi->hpd_regs = devm_kcalloc(&pdev->dev,
|
||||
config->hpd_reg_cnt,
|
||||
sizeof(hdmi->hpd_regs[0]),
|
||||
GFP_KERNEL);
|
||||
if (!hdmi->hpd_regs) {
|
||||
ret = -ENOMEM;
|
||||
goto fail;
|
||||
@ -178,8 +180,10 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
|
||||
hdmi->hpd_regs[i] = reg;
|
||||
}
|
||||
|
||||
hdmi->pwr_regs = devm_kzalloc(&pdev->dev, sizeof(hdmi->pwr_regs[0]) *
|
||||
config->pwr_reg_cnt, GFP_KERNEL);
|
||||
hdmi->pwr_regs = devm_kcalloc(&pdev->dev,
|
||||
config->pwr_reg_cnt,
|
||||
sizeof(hdmi->pwr_regs[0]),
|
||||
GFP_KERNEL);
|
||||
if (!hdmi->pwr_regs) {
|
||||
ret = -ENOMEM;
|
||||
goto fail;
|
||||
@ -199,8 +203,10 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
|
||||
hdmi->pwr_regs[i] = reg;
|
||||
}
|
||||
|
||||
hdmi->hpd_clks = devm_kzalloc(&pdev->dev, sizeof(hdmi->hpd_clks[0]) *
|
||||
config->hpd_clk_cnt, GFP_KERNEL);
|
||||
hdmi->hpd_clks = devm_kcalloc(&pdev->dev,
|
||||
config->hpd_clk_cnt,
|
||||
sizeof(hdmi->hpd_clks[0]),
|
||||
GFP_KERNEL);
|
||||
if (!hdmi->hpd_clks) {
|
||||
ret = -ENOMEM;
|
||||
goto fail;
|
||||
@ -219,8 +225,10 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
|
||||
hdmi->hpd_clks[i] = clk;
|
||||
}
|
||||
|
||||
hdmi->pwr_clks = devm_kzalloc(&pdev->dev, sizeof(hdmi->pwr_clks[0]) *
|
||||
config->pwr_clk_cnt, GFP_KERNEL);
|
||||
hdmi->pwr_clks = devm_kcalloc(&pdev->dev,
|
||||
config->pwr_clk_cnt,
|
||||
sizeof(hdmi->pwr_clks[0]),
|
||||
GFP_KERNEL);
|
||||
if (!hdmi->pwr_clks) {
|
||||
ret = -ENOMEM;
|
||||
goto fail;
|
||||
|
@ -21,12 +21,12 @@ static int msm_hdmi_phy_resource_init(struct hdmi_phy *phy)
|
||||
struct device *dev = &phy->pdev->dev;
|
||||
int i, ret;
|
||||
|
||||
phy->regs = devm_kzalloc(dev, sizeof(phy->regs[0]) * cfg->num_regs,
|
||||
phy->regs = devm_kcalloc(dev, cfg->num_regs, sizeof(phy->regs[0]),
|
||||
GFP_KERNEL);
|
||||
if (!phy->regs)
|
||||
return -ENOMEM;
|
||||
|
||||
phy->clks = devm_kzalloc(dev, sizeof(phy->clks[0]) * cfg->num_clks,
|
||||
phy->clks = devm_kcalloc(dev, cfg->num_clks, sizeof(phy->clks[0]),
|
||||
GFP_KERNEL);
|
||||
if (!phy->clks)
|
||||
return -ENOMEM;
|
||||
|
@ -624,7 +624,8 @@ static int sensor_hub_probe(struct hid_device *hdev,
|
||||
ret = -EINVAL;
|
||||
goto err_stop_hw;
|
||||
}
|
||||
sd->hid_sensor_hub_client_devs = devm_kzalloc(&hdev->dev, dev_cnt *
|
||||
sd->hid_sensor_hub_client_devs = devm_kcalloc(&hdev->dev,
|
||||
dev_cnt,
|
||||
sizeof(struct mfd_cell),
|
||||
GFP_KERNEL);
|
||||
if (sd->hid_sensor_hub_client_devs == NULL) {
|
||||
|
@ -121,9 +121,9 @@ static void process_recv(struct ishtp_cl *hid_ishtp_cl, void *recv_buf,
|
||||
}
|
||||
client_data->hid_dev_count = (unsigned int)*payload;
|
||||
if (!client_data->hid_devices)
|
||||
client_data->hid_devices = devm_kzalloc(
|
||||
client_data->hid_devices = devm_kcalloc(
|
||||
&client_data->cl_device->dev,
|
||||
client_data->hid_dev_count *
|
||||
client_data->hid_dev_count,
|
||||
sizeof(struct device_info),
|
||||
GFP_KERNEL);
|
||||
if (!client_data->hid_devices) {
|
||||
|
@ -1363,7 +1363,7 @@ static int wacom_led_groups_alloc_and_register_one(struct device *dev,
|
||||
if (!devres_open_group(dev, &wacom->led.groups[group_id], GFP_KERNEL))
|
||||
return -ENOMEM;
|
||||
|
||||
leds = devm_kzalloc(dev, sizeof(struct wacom_led) * count, GFP_KERNEL);
|
||||
leds = devm_kcalloc(dev, count, sizeof(struct wacom_led), GFP_KERNEL);
|
||||
if (!leds) {
|
||||
error = -ENOMEM;
|
||||
goto err;
|
||||
@ -1463,7 +1463,7 @@ static int wacom_led_groups_allocate(struct wacom *wacom, int count)
|
||||
struct wacom_group_leds *groups;
|
||||
int error;
|
||||
|
||||
groups = devm_kzalloc(dev, sizeof(struct wacom_group_leds) * count,
|
||||
groups = devm_kcalloc(dev, count, sizeof(struct wacom_group_leds),
|
||||
GFP_KERNEL);
|
||||
if (!groups)
|
||||
return -ENOMEM;
|
||||
|
@ -894,7 +894,7 @@ static int aspeed_create_fan(struct device *dev,
|
||||
count = of_property_count_u8_elems(child, "aspeed,fan-tach-ch");
|
||||
if (count < 1)
|
||||
return -EINVAL;
|
||||
fan_tach_ch = devm_kzalloc(dev, sizeof(*fan_tach_ch) * count,
|
||||
fan_tach_ch = devm_kcalloc(dev, count, sizeof(*fan_tach_ch),
|
||||
GFP_KERNEL);
|
||||
if (!fan_tach_ch)
|
||||
return -ENOMEM;
|
||||
|
@ -441,8 +441,8 @@ static int gpio_fan_get_of_data(struct gpio_fan_data *fan_data)
|
||||
dev_err(dev, "DT properties empty / missing");
|
||||
return -ENODEV;
|
||||
}
|
||||
gpios = devm_kzalloc(dev,
|
||||
fan_data->num_gpios * sizeof(struct gpio_desc *),
|
||||
gpios = devm_kcalloc(dev,
|
||||
fan_data->num_gpios, sizeof(struct gpio_desc *),
|
||||
GFP_KERNEL);
|
||||
if (!gpios)
|
||||
return -ENOMEM;
|
||||
@ -471,8 +471,8 @@ static int gpio_fan_get_of_data(struct gpio_fan_data *fan_data)
|
||||
* Speed map is in the form <RPM ctrl_val RPM ctrl_val ...>
|
||||
* this needs splitting into pairs to create gpio_fan_speed structs
|
||||
*/
|
||||
speed = devm_kzalloc(dev,
|
||||
fan_data->num_speed * sizeof(struct gpio_fan_speed),
|
||||
speed = devm_kcalloc(dev,
|
||||
fan_data->num_speed, sizeof(struct gpio_fan_speed),
|
||||
GFP_KERNEL);
|
||||
if (!speed)
|
||||
return -ENOMEM;
|
||||
|
@ -326,9 +326,9 @@ static int populate_attr_groups(struct platform_device *pdev)
|
||||
of_node_put(opal);
|
||||
|
||||
for (type = 0; type < MAX_SENSOR_TYPE; type++) {
|
||||
sensor_groups[type].group.attrs = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct attribute *) *
|
||||
(sensor_groups[type].attr_count + 1),
|
||||
sensor_groups[type].group.attrs = devm_kcalloc(&pdev->dev,
|
||||
sensor_groups[type].attr_count + 1,
|
||||
sizeof(struct attribute *),
|
||||
GFP_KERNEL);
|
||||
if (!sensor_groups[type].group.attrs)
|
||||
return -ENOMEM;
|
||||
@ -409,7 +409,8 @@ static int create_device_attrs(struct platform_device *pdev)
|
||||
int err = 0;
|
||||
|
||||
opal = of_find_node_by_path("/ibm,opal/sensors");
|
||||
sdata = devm_kzalloc(&pdev->dev, pdata->sensors_count * sizeof(*sdata),
|
||||
sdata = devm_kcalloc(&pdev->dev,
|
||||
pdata->sensors_count, sizeof(*sdata),
|
||||
GFP_KERNEL);
|
||||
if (!sdata) {
|
||||
err = -ENOMEM;
|
||||
|
@ -92,8 +92,8 @@ static int iio_hwmon_probe(struct platform_device *pdev)
|
||||
while (st->channels[st->num_channels].indio_dev)
|
||||
st->num_channels++;
|
||||
|
||||
st->attrs = devm_kzalloc(dev,
|
||||
sizeof(*st->attrs) * (st->num_channels + 1),
|
||||
st->attrs = devm_kcalloc(dev,
|
||||
st->num_channels + 1, sizeof(*st->attrs),
|
||||
GFP_KERNEL);
|
||||
if (st->attrs == NULL) {
|
||||
ret = -ENOMEM;
|
||||
|
@ -426,12 +426,12 @@ nct6683_create_attr_group(struct device *dev,
|
||||
if (group == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
attrs = devm_kzalloc(dev, sizeof(*attrs) * (repeat * count + 1),
|
||||
attrs = devm_kcalloc(dev, repeat * count + 1, sizeof(*attrs),
|
||||
GFP_KERNEL);
|
||||
if (attrs == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
su = devm_kzalloc(dev, sizeof(*su) * repeat * count,
|
||||
su = devm_kzalloc(dev, array3_size(repeat, count, sizeof(*su)),
|
||||
GFP_KERNEL);
|
||||
if (su == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
@ -1190,12 +1190,12 @@ nct6775_create_attr_group(struct device *dev,
|
||||
if (group == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
attrs = devm_kzalloc(dev, sizeof(*attrs) * (repeat * count + 1),
|
||||
attrs = devm_kcalloc(dev, repeat * count + 1, sizeof(*attrs),
|
||||
GFP_KERNEL);
|
||||
if (attrs == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
su = devm_kzalloc(dev, sizeof(*su) * repeat * count,
|
||||
su = devm_kzalloc(dev, array3_size(repeat, count, sizeof(*su)),
|
||||
GFP_KERNEL);
|
||||
if (su == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
@ -2176,8 +2176,8 @@ static int pmbus_init_debugfs(struct i2c_client *client,
|
||||
}
|
||||
|
||||
/* Allocate the max possible entries we need. */
|
||||
entries = devm_kzalloc(data->dev,
|
||||
sizeof(*entries) * (data->info->pages * 10),
|
||||
entries = devm_kcalloc(data->dev,
|
||||
data->info->pages * 10, sizeof(*entries),
|
||||
GFP_KERNEL);
|
||||
if (!entries)
|
||||
return -ENOMEM;
|
||||
|
@ -454,8 +454,8 @@ static int ucd9000_init_debugfs(struct i2c_client *client,
|
||||
*/
|
||||
if (mid->driver_data == ucd9090 || mid->driver_data == ucd90160 ||
|
||||
mid->driver_data == ucd90910) {
|
||||
entries = devm_kzalloc(&client->dev,
|
||||
sizeof(*entries) * UCD9000_GPI_COUNT,
|
||||
entries = devm_kcalloc(&client->dev,
|
||||
UCD9000_GPI_COUNT, sizeof(*entries),
|
||||
GFP_KERNEL);
|
||||
if (!entries)
|
||||
return -ENOMEM;
|
||||
|
@ -180,7 +180,7 @@ static int pwm_fan_of_get_cooling_data(struct device *dev,
|
||||
}
|
||||
|
||||
num = ret;
|
||||
ctx->pwm_fan_cooling_levels = devm_kzalloc(dev, num * sizeof(u32),
|
||||
ctx->pwm_fan_cooling_levels = devm_kcalloc(dev, num, sizeof(u32),
|
||||
GFP_KERNEL);
|
||||
if (!ctx->pwm_fan_cooling_levels)
|
||||
return -ENOMEM;
|
||||
|
@ -683,8 +683,8 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)
|
||||
if (drvdata->buffer_depth & 0x80000000)
|
||||
return -EINVAL;
|
||||
|
||||
drvdata->buf = devm_kzalloc(dev,
|
||||
drvdata->buffer_depth * 4, GFP_KERNEL);
|
||||
drvdata->buf = devm_kcalloc(dev,
|
||||
drvdata->buffer_depth, 4, GFP_KERNEL);
|
||||
if (!drvdata->buf)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -71,21 +71,24 @@ static int of_coresight_alloc_memory(struct device *dev,
|
||||
struct coresight_platform_data *pdata)
|
||||
{
|
||||
/* List of output port on this component */
|
||||
pdata->outports = devm_kzalloc(dev, pdata->nr_outport *
|
||||
pdata->outports = devm_kcalloc(dev,
|
||||
pdata->nr_outport,
|
||||
sizeof(*pdata->outports),
|
||||
GFP_KERNEL);
|
||||
if (!pdata->outports)
|
||||
return -ENOMEM;
|
||||
|
||||
/* Children connected to this component via @outports */
|
||||
pdata->child_names = devm_kzalloc(dev, pdata->nr_outport *
|
||||
pdata->child_names = devm_kcalloc(dev,
|
||||
pdata->nr_outport,
|
||||
sizeof(*pdata->child_names),
|
||||
GFP_KERNEL);
|
||||
if (!pdata->child_names)
|
||||
return -ENOMEM;
|
||||
|
||||
/* Port number on the child this component is connected to */
|
||||
pdata->child_ports = devm_kzalloc(dev, pdata->nr_outport *
|
||||
pdata->child_ports = devm_kcalloc(dev,
|
||||
pdata->nr_outport,
|
||||
sizeof(*pdata->child_ports),
|
||||
GFP_KERNEL);
|
||||
if (!pdata->child_ports)
|
||||
|
@ -1691,8 +1691,8 @@ static int qup_i2c_probe(struct platform_device *pdev)
|
||||
|
||||
qup->max_xfer_sg_len = (MX_BLOCKS << 1);
|
||||
blocks = (MX_DMA_BLOCKS << 1) + 1;
|
||||
qup->btx.sg = devm_kzalloc(&pdev->dev,
|
||||
sizeof(*qup->btx.sg) * blocks,
|
||||
qup->btx.sg = devm_kcalloc(&pdev->dev,
|
||||
blocks, sizeof(*qup->btx.sg),
|
||||
GFP_KERNEL);
|
||||
if (!qup->btx.sg) {
|
||||
ret = -ENOMEM;
|
||||
@ -1700,8 +1700,8 @@ static int qup_i2c_probe(struct platform_device *pdev)
|
||||
}
|
||||
sg_init_table(qup->btx.sg, blocks);
|
||||
|
||||
qup->brx.sg = devm_kzalloc(&pdev->dev,
|
||||
sizeof(*qup->brx.sg) * blocks,
|
||||
qup->brx.sg = devm_kcalloc(&pdev->dev,
|
||||
blocks, sizeof(*qup->brx.sg),
|
||||
GFP_KERNEL);
|
||||
if (!qup->brx.sg) {
|
||||
ret = -ENOMEM;
|
||||
|
@ -88,8 +88,8 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
|
||||
|
||||
mux->data.n_values = of_get_child_count(np);
|
||||
|
||||
values = devm_kzalloc(&pdev->dev,
|
||||
sizeof(*mux->data.values) * mux->data.n_values,
|
||||
values = devm_kcalloc(&pdev->dev,
|
||||
mux->data.n_values, sizeof(*mux->data.values),
|
||||
GFP_KERNEL);
|
||||
if (!values) {
|
||||
dev_err(&pdev->dev, "Cannot allocate values array");
|
||||
@ -111,8 +111,9 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
gpios = devm_kzalloc(&pdev->dev,
|
||||
sizeof(*mux->data.gpios) * mux->data.n_gpios, GFP_KERNEL);
|
||||
gpios = devm_kcalloc(&pdev->dev,
|
||||
mux->data.n_gpios, sizeof(*mux->data.gpios),
|
||||
GFP_KERNEL);
|
||||
if (!gpios) {
|
||||
dev_err(&pdev->dev, "Cannot allocate gpios array");
|
||||
return -ENOMEM;
|
||||
|
@ -124,8 +124,8 @@ static int i2c_mux_reg_probe_dt(struct regmux *mux,
|
||||
}
|
||||
mux->data.write_only = of_property_read_bool(np, "write-only");
|
||||
|
||||
values = devm_kzalloc(&pdev->dev,
|
||||
sizeof(*mux->data.values) * mux->data.n_values,
|
||||
values = devm_kcalloc(&pdev->dev,
|
||||
mux->data.n_values, sizeof(*mux->data.values),
|
||||
GFP_KERNEL);
|
||||
if (!values) {
|
||||
dev_err(&pdev->dev, "Cannot allocate values array");
|
||||
|
@ -624,8 +624,8 @@ static int at91_adc_trigger_init(struct iio_dev *idev)
|
||||
struct at91_adc_state *st = iio_priv(idev);
|
||||
int i, ret;
|
||||
|
||||
st->trig = devm_kzalloc(&idev->dev,
|
||||
st->trigger_number * sizeof(*st->trig),
|
||||
st->trig = devm_kcalloc(&idev->dev,
|
||||
st->trigger_number, sizeof(*st->trig),
|
||||
GFP_KERNEL);
|
||||
|
||||
if (st->trig == NULL) {
|
||||
@ -908,7 +908,8 @@ static int at91_adc_probe_dt(struct at91_adc_state *st,
|
||||
st->registers = &st->caps->registers;
|
||||
st->num_channels = st->caps->num_channels;
|
||||
st->trigger_number = of_get_child_count(node);
|
||||
st->trigger_list = devm_kzalloc(&idev->dev, st->trigger_number *
|
||||
st->trigger_list = devm_kcalloc(&idev->dev,
|
||||
st->trigger_number,
|
||||
sizeof(struct at91_adc_trigger),
|
||||
GFP_KERNEL);
|
||||
if (!st->trigger_list) {
|
||||
|
@ -1453,8 +1453,10 @@ static int max1363_alloc_scan_masks(struct iio_dev *indio_dev)
|
||||
int i;
|
||||
|
||||
masks = devm_kzalloc(&indio_dev->dev,
|
||||
BITS_TO_LONGS(MAX1363_MAX_CHANNELS) * sizeof(long) *
|
||||
(st->chip_info->num_modes + 1), GFP_KERNEL);
|
||||
array3_size(BITS_TO_LONGS(MAX1363_MAX_CHANNELS),
|
||||
sizeof(long),
|
||||
st->chip_info->num_modes + 1),
|
||||
GFP_KERNEL);
|
||||
if (!masks)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -898,9 +898,10 @@ static int twl6030_gpadc_probe(struct platform_device *pdev)
|
||||
|
||||
gpadc = iio_priv(indio_dev);
|
||||
|
||||
gpadc->twl6030_cal_tbl = devm_kzalloc(dev,
|
||||
sizeof(*gpadc->twl6030_cal_tbl) *
|
||||
pdata->nchannels, GFP_KERNEL);
|
||||
gpadc->twl6030_cal_tbl = devm_kcalloc(dev,
|
||||
pdata->nchannels,
|
||||
sizeof(*gpadc->twl6030_cal_tbl),
|
||||
GFP_KERNEL);
|
||||
if (!gpadc->twl6030_cal_tbl)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -536,8 +536,9 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
|
||||
st->channel_offstate[reg] = tmp;
|
||||
}
|
||||
|
||||
channels = devm_kzalloc(st->dev,
|
||||
(1 + 2 * num_channels) * sizeof(*channels), GFP_KERNEL);
|
||||
channels = devm_kcalloc(st->dev,
|
||||
1 + 2 * num_channels, sizeof(*channels),
|
||||
GFP_KERNEL);
|
||||
if (!channels)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -281,9 +281,10 @@ static int mux_configure_channel(struct device *dev, struct mux *mux,
|
||||
if (!page)
|
||||
return -ENOMEM;
|
||||
}
|
||||
child->ext_info_cache = devm_kzalloc(dev,
|
||||
sizeof(*child->ext_info_cache) *
|
||||
num_ext_info, GFP_KERNEL);
|
||||
child->ext_info_cache = devm_kcalloc(dev,
|
||||
num_ext_info,
|
||||
sizeof(*child->ext_info_cache),
|
||||
GFP_KERNEL);
|
||||
if (!child->ext_info_cache)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -109,8 +109,8 @@ static int clps711x_keypad_probe(struct platform_device *pdev)
|
||||
if (priv->row_count < 1)
|
||||
return -EINVAL;
|
||||
|
||||
priv->gpio_data = devm_kzalloc(dev,
|
||||
sizeof(*priv->gpio_data) * priv->row_count,
|
||||
priv->gpio_data = devm_kcalloc(dev,
|
||||
priv->row_count, sizeof(*priv->gpio_data),
|
||||
GFP_KERNEL);
|
||||
if (!priv->gpio_data)
|
||||
return -ENOMEM;
|
||||
|
@ -443,9 +443,9 @@ matrix_keypad_parse_dt(struct device *dev)
|
||||
of_property_read_u32(np, "col-scan-delay-us",
|
||||
&pdata->col_scan_delay_us);
|
||||
|
||||
gpios = devm_kzalloc(dev,
|
||||
sizeof(unsigned int) *
|
||||
(pdata->num_row_gpios + pdata->num_col_gpios),
|
||||
gpios = devm_kcalloc(dev,
|
||||
pdata->num_row_gpios + pdata->num_col_gpios,
|
||||
sizeof(unsigned int),
|
||||
GFP_KERNEL);
|
||||
if (!gpios) {
|
||||
dev_err(dev, "could not allocate memory for gpios\n");
|
||||
|
@ -281,7 +281,7 @@ samsung_keypad_parse_dt(struct device *dev)
|
||||
|
||||
key_count = of_get_child_count(np);
|
||||
keymap_data->keymap_size = key_count;
|
||||
keymap = devm_kzalloc(dev, sizeof(uint32_t) * key_count, GFP_KERNEL);
|
||||
keymap = devm_kcalloc(dev, key_count, sizeof(uint32_t), GFP_KERNEL);
|
||||
if (!keymap) {
|
||||
dev_err(dev, "could not allocate memory for keymap\n");
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
@ -170,8 +170,8 @@ int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data,
|
||||
return -EINVAL;
|
||||
|
||||
if (!keymap) {
|
||||
keymap = devm_kzalloc(input_dev->dev.parent,
|
||||
max_keys * sizeof(*keymap),
|
||||
keymap = devm_kcalloc(input_dev->dev.parent,
|
||||
max_keys, sizeof(*keymap),
|
||||
GFP_KERNEL);
|
||||
if (!keymap) {
|
||||
dev_err(input_dev->dev.parent,
|
||||
|
@ -283,8 +283,8 @@ static int rotary_encoder_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
encoder->irq =
|
||||
devm_kzalloc(dev,
|
||||
sizeof(*encoder->irq) * encoder->gpios->ndescs,
|
||||
devm_kcalloc(dev,
|
||||
encoder->gpios->ndescs, sizeof(*encoder->irq),
|
||||
GFP_KERNEL);
|
||||
if (!encoder->irq)
|
||||
return -ENOMEM;
|
||||
|
@ -636,9 +636,10 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr,
|
||||
rdesc->num_registers = bitmap_weight(rdesc->presense_map,
|
||||
RMI_REG_DESC_PRESENSE_BITS);
|
||||
|
||||
rdesc->registers = devm_kzalloc(&d->dev, rdesc->num_registers *
|
||||
sizeof(struct rmi_register_desc_item),
|
||||
GFP_KERNEL);
|
||||
rdesc->registers = devm_kcalloc(&d->dev,
|
||||
rdesc->num_registers,
|
||||
sizeof(struct rmi_register_desc_item),
|
||||
GFP_KERNEL);
|
||||
if (!rdesc->registers)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -1061,7 +1062,7 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
|
||||
data->num_of_irq_regs = (data->irq_count + 7) / 8;
|
||||
|
||||
size = BITS_TO_LONGS(data->irq_count) * sizeof(unsigned long);
|
||||
data->irq_memory = devm_kzalloc(dev, size * 4, GFP_KERNEL);
|
||||
data->irq_memory = devm_kcalloc(dev, size, 4, GFP_KERNEL);
|
||||
if (!data->irq_memory) {
|
||||
dev_err(dev, "Failed to allocate memory for irq masks.\n");
|
||||
return -ENOMEM;
|
||||
|
@ -1190,14 +1190,15 @@ static int rmi_f11_initialize(struct rmi_function *fn)
|
||||
f11->sensor.attn_size += f11->sensor.nbr_fingers * 2;
|
||||
|
||||
/* allocate the in-kernel tracking buffers */
|
||||
sensor->tracking_pos = devm_kzalloc(&fn->dev,
|
||||
sizeof(struct input_mt_pos) * sensor->nbr_fingers,
|
||||
sensor->tracking_pos = devm_kcalloc(&fn->dev,
|
||||
sensor->nbr_fingers, sizeof(struct input_mt_pos),
|
||||
GFP_KERNEL);
|
||||
sensor->tracking_slots = devm_kcalloc(&fn->dev,
|
||||
sensor->nbr_fingers, sizeof(int), GFP_KERNEL);
|
||||
sensor->objs = devm_kcalloc(&fn->dev,
|
||||
sensor->nbr_fingers,
|
||||
sizeof(struct rmi_2d_sensor_abs_object),
|
||||
GFP_KERNEL);
|
||||
sensor->tracking_slots = devm_kzalloc(&fn->dev,
|
||||
sizeof(int) * sensor->nbr_fingers, GFP_KERNEL);
|
||||
sensor->objs = devm_kzalloc(&fn->dev,
|
||||
sizeof(struct rmi_2d_sensor_abs_object)
|
||||
* sensor->nbr_fingers, GFP_KERNEL);
|
||||
if (!sensor->tracking_pos || !sensor->tracking_slots || !sensor->objs)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -502,14 +502,15 @@ static int rmi_f12_probe(struct rmi_function *fn)
|
||||
}
|
||||
|
||||
/* allocate the in-kernel tracking buffers */
|
||||
sensor->tracking_pos = devm_kzalloc(&fn->dev,
|
||||
sizeof(struct input_mt_pos) * sensor->nbr_fingers,
|
||||
sensor->tracking_pos = devm_kcalloc(&fn->dev,
|
||||
sensor->nbr_fingers, sizeof(struct input_mt_pos),
|
||||
GFP_KERNEL);
|
||||
sensor->tracking_slots = devm_kcalloc(&fn->dev,
|
||||
sensor->nbr_fingers, sizeof(int), GFP_KERNEL);
|
||||
sensor->objs = devm_kcalloc(&fn->dev,
|
||||
sensor->nbr_fingers,
|
||||
sizeof(struct rmi_2d_sensor_abs_object),
|
||||
GFP_KERNEL);
|
||||
sensor->tracking_slots = devm_kzalloc(&fn->dev,
|
||||
sizeof(int) * sensor->nbr_fingers, GFP_KERNEL);
|
||||
sensor->objs = devm_kzalloc(&fn->dev,
|
||||
sizeof(struct rmi_2d_sensor_abs_object)
|
||||
* sensor->nbr_fingers, GFP_KERNEL);
|
||||
if (!sensor->tracking_pos || !sensor->tracking_slots || !sensor->objs)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -685,7 +685,7 @@ static int rmi_f54_probe(struct rmi_function *fn)
|
||||
rx = f54->num_rx_electrodes;
|
||||
tx = f54->num_tx_electrodes;
|
||||
f54->report_data = devm_kzalloc(&fn->dev,
|
||||
sizeof(u16) * tx * rx,
|
||||
array3_size(tx, rx, sizeof(u16)),
|
||||
GFP_KERNEL);
|
||||
if (f54->report_data == NULL)
|
||||
return -ENOMEM;
|
||||
|
@ -69,7 +69,7 @@ static int rmi_spi_manage_pools(struct rmi_spi_xport *rmi_spi, int len)
|
||||
buf_size = RMI_SPI_XFER_SIZE_LIMIT;
|
||||
|
||||
tmp = rmi_spi->rx_buf;
|
||||
buf = devm_kzalloc(&spi->dev, buf_size * 2,
|
||||
buf = devm_kcalloc(&spi->dev, buf_size, 2,
|
||||
GFP_KERNEL | GFP_DMA);
|
||||
if (!buf)
|
||||
return -ENOMEM;
|
||||
@ -96,9 +96,10 @@ static int rmi_spi_manage_pools(struct rmi_spi_xport *rmi_spi, int len)
|
||||
* per byte delays.
|
||||
*/
|
||||
tmp = rmi_spi->rx_xfers;
|
||||
xfer_buf = devm_kzalloc(&spi->dev,
|
||||
(rmi_spi->rx_xfer_count + rmi_spi->tx_xfer_count)
|
||||
* sizeof(struct spi_transfer), GFP_KERNEL);
|
||||
xfer_buf = devm_kcalloc(&spi->dev,
|
||||
rmi_spi->rx_xfer_count + rmi_spi->tx_xfer_count,
|
||||
sizeof(struct spi_transfer),
|
||||
GFP_KERNEL);
|
||||
if (!xfer_buf)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -2082,7 +2082,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
smmu->irqs = devm_kzalloc(dev, sizeof(*smmu->irqs) * num_irqs,
|
||||
smmu->irqs = devm_kcalloc(dev, num_irqs, sizeof(*smmu->irqs),
|
||||
GFP_KERNEL);
|
||||
if (!smmu->irqs) {
|
||||
dev_err(dev, "failed to allocate %d irqs\n", num_irqs);
|
||||
|
@ -1135,7 +1135,7 @@ static int rk_iommu_probe(struct platform_device *pdev)
|
||||
iommu->dev = dev;
|
||||
iommu->num_mmu = 0;
|
||||
|
||||
iommu->bases = devm_kzalloc(dev, sizeof(*iommu->bases) * num_res,
|
||||
iommu->bases = devm_kcalloc(dev, num_res, sizeof(*iommu->bases),
|
||||
GFP_KERNEL);
|
||||
if (!iommu->bases)
|
||||
return -ENOMEM;
|
||||
|
@ -354,7 +354,7 @@ static int pdc_intc_probe(struct platform_device *pdev)
|
||||
priv->nr_syswakes = val;
|
||||
|
||||
/* Get peripheral IRQ numbers */
|
||||
priv->perip_irqs = devm_kzalloc(&pdev->dev, 4 * priv->nr_perips,
|
||||
priv->perip_irqs = devm_kcalloc(&pdev->dev, 4, priv->nr_perips,
|
||||
GFP_KERNEL);
|
||||
if (!priv->perip_irqs) {
|
||||
dev_err(&pdev->dev, "cannot allocate perip IRQ list\n");
|
||||
|
@ -191,8 +191,8 @@ static int mvebu_gicp_probe(struct platform_device *pdev)
|
||||
gicp->spi_ranges_cnt = ret / 2;
|
||||
|
||||
gicp->spi_ranges =
|
||||
devm_kzalloc(&pdev->dev,
|
||||
gicp->spi_ranges_cnt *
|
||||
devm_kcalloc(&pdev->dev,
|
||||
gicp->spi_ranges_cnt,
|
||||
sizeof(struct mvebu_gicp_spi_range),
|
||||
GFP_KERNEL);
|
||||
if (!gicp->spi_ranges)
|
||||
@ -210,8 +210,8 @@ static int mvebu_gicp_probe(struct platform_device *pdev)
|
||||
gicp->spi_cnt += gicp->spi_ranges[i].count;
|
||||
}
|
||||
|
||||
gicp->spi_bitmap = devm_kzalloc(&pdev->dev,
|
||||
BITS_TO_LONGS(gicp->spi_cnt) * sizeof(long),
|
||||
gicp->spi_bitmap = devm_kcalloc(&pdev->dev,
|
||||
BITS_TO_LONGS(gicp->spi_cnt), sizeof(long),
|
||||
GFP_KERNEL);
|
||||
if (!gicp->spi_bitmap)
|
||||
return -ENOMEM;
|
||||
|
@ -108,7 +108,7 @@ static int adp5520_led_probe(struct platform_device *pdev)
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
led = devm_kzalloc(&pdev->dev, sizeof(*led) * pdata->num_leds,
|
||||
led = devm_kcalloc(&pdev->dev, pdata->num_leds, sizeof(*led),
|
||||
GFP_KERNEL);
|
||||
if (!led)
|
||||
return -ENOMEM;
|
||||
|
@ -171,8 +171,8 @@ static int apu_led_config(struct device *dev, struct apu_led_pdata *apuld)
|
||||
int i;
|
||||
int err;
|
||||
|
||||
apu_led->pled = devm_kzalloc(dev,
|
||||
sizeof(struct apu_led_priv) * apu_led->num_led_instances,
|
||||
apu_led->pled = devm_kcalloc(dev,
|
||||
apu_led->num_led_instances, sizeof(struct apu_led_priv),
|
||||
GFP_KERNEL);
|
||||
|
||||
if (!apu_led->pled)
|
||||
|
@ -113,8 +113,8 @@ static int da9052_led_probe(struct platform_device *pdev)
|
||||
goto err;
|
||||
}
|
||||
|
||||
led = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct da9052_led) * pled->num_leds,
|
||||
led = devm_kcalloc(&pdev->dev,
|
||||
pled->num_leds, sizeof(struct da9052_led),
|
||||
GFP_KERNEL);
|
||||
if (!led) {
|
||||
error = -ENOMEM;
|
||||
|
@ -533,8 +533,8 @@ static int lp5521_probe(struct i2c_client *client,
|
||||
if (!chip)
|
||||
return -ENOMEM;
|
||||
|
||||
led = devm_kzalloc(&client->dev,
|
||||
sizeof(*led) * pdata->num_channels, GFP_KERNEL);
|
||||
led = devm_kcalloc(&client->dev,
|
||||
pdata->num_channels, sizeof(*led), GFP_KERNEL);
|
||||
if (!led)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -898,8 +898,8 @@ static int lp5523_probe(struct i2c_client *client,
|
||||
if (!chip)
|
||||
return -ENOMEM;
|
||||
|
||||
led = devm_kzalloc(&client->dev,
|
||||
sizeof(*led) * pdata->num_channels, GFP_KERNEL);
|
||||
led = devm_kcalloc(&client->dev,
|
||||
pdata->num_channels, sizeof(*led), GFP_KERNEL);
|
||||
if (!led)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -534,8 +534,8 @@ static int lp5562_probe(struct i2c_client *client,
|
||||
if (!chip)
|
||||
return -ENOMEM;
|
||||
|
||||
led = devm_kzalloc(&client->dev,
|
||||
sizeof(*led) * pdata->num_channels, GFP_KERNEL);
|
||||
led = devm_kcalloc(&client->dev,
|
||||
pdata->num_channels, sizeof(*led), GFP_KERNEL);
|
||||
if (!led)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -560,7 +560,7 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev,
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
cfg = devm_kzalloc(dev, sizeof(*cfg) * num_channels, GFP_KERNEL);
|
||||
cfg = devm_kcalloc(dev, num_channels, sizeof(*cfg), GFP_KERNEL);
|
||||
if (!cfg)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
|
@ -327,8 +327,8 @@ static int lp8501_probe(struct i2c_client *client,
|
||||
if (!chip)
|
||||
return -ENOMEM;
|
||||
|
||||
led = devm_kzalloc(&client->dev,
|
||||
sizeof(*led) * pdata->num_channels, GFP_KERNEL);
|
||||
led = devm_kcalloc(&client->dev,
|
||||
pdata->num_channels, sizeof(*led), GFP_KERNEL);
|
||||
if (!led)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -128,8 +128,8 @@ static int lt3593_led_probe(struct platform_device *pdev)
|
||||
if (!pdata)
|
||||
return -EBUSY;
|
||||
|
||||
leds_data = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct lt3593_led_data) * pdata->num_leds,
|
||||
leds_data = devm_kcalloc(&pdev->dev,
|
||||
pdata->num_leds, sizeof(struct lt3593_led_data),
|
||||
GFP_KERNEL);
|
||||
if (!leds_data)
|
||||
return -ENOMEM;
|
||||
|
@ -136,7 +136,7 @@ static struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(
|
||||
|
||||
pdata->num_leds = of_get_child_count(parent);
|
||||
|
||||
pdata->led = devm_kzalloc(dev, pdata->num_leds * sizeof(*pdata->led),
|
||||
pdata->led = devm_kcalloc(dev, pdata->num_leds, sizeof(*pdata->led),
|
||||
GFP_KERNEL);
|
||||
if (!pdata->led) {
|
||||
ret = -ENOMEM;
|
||||
@ -210,7 +210,7 @@ static int __init mc13xxx_led_probe(struct platform_device *pdev)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
leds->led = devm_kzalloc(dev, leds->num_leds * sizeof(*leds->led),
|
||||
leds->led = devm_kcalloc(dev, leds->num_leds, sizeof(*leds->led),
|
||||
GFP_KERNEL);
|
||||
if (!leds->led)
|
||||
return -ENOMEM;
|
||||
|
@ -329,8 +329,10 @@ static int mlxcpld_led_config(struct device *dev,
|
||||
int i;
|
||||
int err;
|
||||
|
||||
cpld->pled = devm_kzalloc(dev, sizeof(struct mlxcpld_led_priv) *
|
||||
cpld->num_led_instances, GFP_KERNEL);
|
||||
cpld->pled = devm_kcalloc(dev,
|
||||
cpld->num_led_instances,
|
||||
sizeof(struct mlxcpld_led_priv),
|
||||
GFP_KERNEL);
|
||||
if (!cpld->pled)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -335,7 +335,7 @@ static int gpio_ext_get_of_pdata(struct device *dev, struct device_node *np,
|
||||
return ret;
|
||||
}
|
||||
num_addr = ret;
|
||||
addr = devm_kzalloc(dev, num_addr * sizeof(*addr), GFP_KERNEL);
|
||||
addr = devm_kcalloc(dev, num_addr, sizeof(*addr), GFP_KERNEL);
|
||||
if (!addr)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -355,7 +355,7 @@ static int gpio_ext_get_of_pdata(struct device *dev, struct device_node *np,
|
||||
return ret;
|
||||
}
|
||||
num_data = ret;
|
||||
data = devm_kzalloc(dev, num_data * sizeof(*data), GFP_KERNEL);
|
||||
data = devm_kcalloc(dev, num_data, sizeof(*data), GFP_KERNEL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -415,7 +415,7 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
|
||||
if (ret % 3)
|
||||
return -EINVAL;
|
||||
num_timers = ret / 3;
|
||||
timers = devm_kzalloc(dev, num_timers * sizeof(*timers),
|
||||
timers = devm_kcalloc(dev, num_timers, sizeof(*timers),
|
||||
GFP_KERNEL);
|
||||
if (!timers)
|
||||
return -ENOMEM;
|
||||
@ -444,7 +444,7 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
leds = devm_kzalloc(dev, num_leds * sizeof(*leds), GFP_KERNEL);
|
||||
leds = devm_kcalloc(dev, num_leds, sizeof(*leds), GFP_KERNEL);
|
||||
if (!leds)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -470,8 +470,8 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
|
||||
goto err_node_put;
|
||||
|
||||
mode_val =
|
||||
devm_kzalloc(dev,
|
||||
NETXBIG_LED_MODE_NUM * sizeof(*mode_val),
|
||||
devm_kcalloc(dev,
|
||||
NETXBIG_LED_MODE_NUM, sizeof(*mode_val),
|
||||
GFP_KERNEL);
|
||||
if (!mode_val) {
|
||||
ret = -ENOMEM;
|
||||
@ -560,8 +560,8 @@ static int netxbig_led_probe(struct platform_device *pdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
leds_data = devm_kzalloc(&pdev->dev,
|
||||
pdata->num_leds * sizeof(*leds_data),
|
||||
leds_data = devm_kcalloc(&pdev->dev,
|
||||
pdata->num_leds, sizeof(*leds_data),
|
||||
GFP_KERNEL);
|
||||
if (!leds_data)
|
||||
return -ENOMEM;
|
||||
|
@ -264,7 +264,7 @@ ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata)
|
||||
if (!num_leds)
|
||||
return -ENODEV;
|
||||
|
||||
leds = devm_kzalloc(dev, num_leds * sizeof(struct ns2_led),
|
||||
leds = devm_kcalloc(dev, num_leds, sizeof(struct ns2_led),
|
||||
GFP_KERNEL);
|
||||
if (!leds)
|
||||
return -ENOMEM;
|
||||
@ -298,8 +298,9 @@ ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata)
|
||||
}
|
||||
|
||||
num_modes = ret / 3;
|
||||
modval = devm_kzalloc(dev,
|
||||
num_modes * sizeof(struct ns2_led_modval),
|
||||
modval = devm_kcalloc(dev,
|
||||
num_modes,
|
||||
sizeof(struct ns2_led_modval),
|
||||
GFP_KERNEL);
|
||||
if (!modval)
|
||||
return -ENOMEM;
|
||||
|
@ -390,8 +390,8 @@ pca955x_pdata_of_init(struct i2c_client *client, struct pca955x_chipdef *chip)
|
||||
if (!pdata)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
pdata->leds = devm_kzalloc(&client->dev,
|
||||
sizeof(struct pca955x_led) * chip->bits,
|
||||
pdata->leds = devm_kcalloc(&client->dev,
|
||||
chip->bits, sizeof(struct pca955x_led),
|
||||
GFP_KERNEL);
|
||||
if (!pdata->leds)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
@ -494,8 +494,8 @@ static int pca955x_probe(struct i2c_client *client,
|
||||
if (!pca955x)
|
||||
return -ENOMEM;
|
||||
|
||||
pca955x->leds = devm_kzalloc(&client->dev,
|
||||
sizeof(*pca955x_led) * chip->bits, GFP_KERNEL);
|
||||
pca955x->leds = devm_kcalloc(&client->dev,
|
||||
chip->bits, sizeof(*pca955x_led), GFP_KERNEL);
|
||||
if (!pca955x->leds)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -300,8 +300,8 @@ pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip)
|
||||
if (!count || count > chip->n_leds)
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
pca963x_leds = devm_kzalloc(&client->dev,
|
||||
sizeof(struct led_info) * chip->n_leds, GFP_KERNEL);
|
||||
pca963x_leds = devm_kcalloc(&client->dev,
|
||||
chip->n_leds, sizeof(struct led_info), GFP_KERNEL);
|
||||
if (!pca963x_leds)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
@ -407,7 +407,7 @@ static int pca963x_probe(struct i2c_client *client,
|
||||
GFP_KERNEL);
|
||||
if (!pca963x_chip)
|
||||
return -ENOMEM;
|
||||
pca963x = devm_kzalloc(&client->dev, chip->n_leds * sizeof(*pca963x),
|
||||
pca963x = devm_kcalloc(&client->dev, chip->n_leds, sizeof(*pca963x),
|
||||
GFP_KERNEL);
|
||||
if (!pca963x)
|
||||
return -ENOMEM;
|
||||
|
@ -697,8 +697,8 @@ tca6507_led_dt_init(struct i2c_client *client)
|
||||
if (!count || count > NUM_LEDS)
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
tca_leds = devm_kzalloc(&client->dev,
|
||||
sizeof(struct led_info) * NUM_LEDS, GFP_KERNEL);
|
||||
tca_leds = devm_kcalloc(&client->dev,
|
||||
NUM_LEDS, sizeof(struct led_info), GFP_KERNEL);
|
||||
if (!tca_leds)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
|
@ -282,13 +282,13 @@ static int hi6220_mbox_probe(struct platform_device *pdev)
|
||||
|
||||
mbox->dev = dev;
|
||||
mbox->chan_num = MBOX_CHAN_MAX;
|
||||
mbox->mchan = devm_kzalloc(dev,
|
||||
mbox->chan_num * sizeof(*mbox->mchan), GFP_KERNEL);
|
||||
mbox->mchan = devm_kcalloc(dev,
|
||||
mbox->chan_num, sizeof(*mbox->mchan), GFP_KERNEL);
|
||||
if (!mbox->mchan)
|
||||
return -ENOMEM;
|
||||
|
||||
mbox->chan = devm_kzalloc(dev,
|
||||
mbox->chan_num * sizeof(*mbox->chan), GFP_KERNEL);
|
||||
mbox->chan = devm_kcalloc(dev,
|
||||
mbox->chan_num, sizeof(*mbox->chan), GFP_KERNEL);
|
||||
if (!mbox->chan)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -442,8 +442,8 @@ static int sti_mbox_probe(struct platform_device *pdev)
|
||||
if (!mbox)
|
||||
return -ENOMEM;
|
||||
|
||||
chans = devm_kzalloc(&pdev->dev,
|
||||
sizeof(*chans) * STI_MBOX_CHAN_MAX, GFP_KERNEL);
|
||||
chans = devm_kcalloc(&pdev->dev,
|
||||
STI_MBOX_CHAN_MAX, sizeof(*chans), GFP_KERNEL);
|
||||
if (!chans)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -729,7 +729,7 @@ static int omap_mbox_probe(struct platform_device *pdev)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
finfoblk = devm_kzalloc(&pdev->dev, info_count * sizeof(*finfoblk),
|
||||
finfoblk = devm_kcalloc(&pdev->dev, info_count, sizeof(*finfoblk),
|
||||
GFP_KERNEL);
|
||||
if (!finfoblk)
|
||||
return -ENOMEM;
|
||||
@ -773,23 +773,23 @@ static int omap_mbox_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(mdev->mbox_base))
|
||||
return PTR_ERR(mdev->mbox_base);
|
||||
|
||||
mdev->irq_ctx = devm_kzalloc(&pdev->dev, num_users * sizeof(u32),
|
||||
mdev->irq_ctx = devm_kcalloc(&pdev->dev, num_users, sizeof(u32),
|
||||
GFP_KERNEL);
|
||||
if (!mdev->irq_ctx)
|
||||
return -ENOMEM;
|
||||
|
||||
/* allocate one extra for marking end of list */
|
||||
list = devm_kzalloc(&pdev->dev, (info_count + 1) * sizeof(*list),
|
||||
list = devm_kcalloc(&pdev->dev, info_count + 1, sizeof(*list),
|
||||
GFP_KERNEL);
|
||||
if (!list)
|
||||
return -ENOMEM;
|
||||
|
||||
chnls = devm_kzalloc(&pdev->dev, (info_count + 1) * sizeof(*chnls),
|
||||
chnls = devm_kcalloc(&pdev->dev, info_count + 1, sizeof(*chnls),
|
||||
GFP_KERNEL);
|
||||
if (!chnls)
|
||||
return -ENOMEM;
|
||||
|
||||
mboxblk = devm_kzalloc(&pdev->dev, info_count * sizeof(*mbox),
|
||||
mboxblk = devm_kcalloc(&pdev->dev, info_count, sizeof(*mbox),
|
||||
GFP_KERNEL);
|
||||
if (!mboxblk)
|
||||
return -ENOMEM;
|
||||
|
@ -568,12 +568,12 @@ static int ti_msgmgr_probe(struct platform_device *pdev)
|
||||
}
|
||||
inst->num_valid_queues = queue_count;
|
||||
|
||||
qinst = devm_kzalloc(dev, sizeof(*qinst) * queue_count, GFP_KERNEL);
|
||||
qinst = devm_kcalloc(dev, queue_count, sizeof(*qinst), GFP_KERNEL);
|
||||
if (!qinst)
|
||||
return -ENOMEM;
|
||||
inst->qinsts = qinst;
|
||||
|
||||
chans = devm_kzalloc(dev, sizeof(*chans) * queue_count, GFP_KERNEL);
|
||||
chans = devm_kcalloc(dev, queue_count, sizeof(*chans), GFP_KERNEL);
|
||||
if (!chans)
|
||||
return -ENOMEM;
|
||||
inst->chans = chans;
|
||||
|
@ -373,7 +373,7 @@ static int s5k5baf_fw_parse(struct device *dev, struct s5k5baf_fw **fw,
|
||||
data += S5K5BAG_FW_TAG_LEN;
|
||||
count -= S5K5BAG_FW_TAG_LEN;
|
||||
|
||||
d = devm_kzalloc(dev, count * sizeof(u16), GFP_KERNEL);
|
||||
d = devm_kcalloc(dev, count, sizeof(u16), GFP_KERNEL);
|
||||
if (!d)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -2586,8 +2586,10 @@ static int vpfe_probe(struct platform_device *pdev)
|
||||
|
||||
pm_runtime_put_sync(&pdev->dev);
|
||||
|
||||
vpfe->sd = devm_kzalloc(&pdev->dev, sizeof(struct v4l2_subdev *) *
|
||||
ARRAY_SIZE(vpfe->cfg->asd), GFP_KERNEL);
|
||||
vpfe->sd = devm_kcalloc(&pdev->dev,
|
||||
ARRAY_SIZE(vpfe->cfg->asd),
|
||||
sizeof(struct v4l2_subdev *),
|
||||
GFP_KERNEL);
|
||||
if (!vpfe->sd) {
|
||||
ret = -ENOMEM;
|
||||
goto probe_out_v4l2_unregister;
|
||||
|
@ -1528,8 +1528,10 @@ vpif_capture_get_pdata(struct platform_device *pdev)
|
||||
if (!pdata)
|
||||
return NULL;
|
||||
pdata->subdev_info =
|
||||
devm_kzalloc(&pdev->dev, sizeof(*pdata->subdev_info) *
|
||||
VPIF_CAPTURE_NUM_CHANNELS, GFP_KERNEL);
|
||||
devm_kcalloc(&pdev->dev,
|
||||
VPIF_CAPTURE_NUM_CHANNELS,
|
||||
sizeof(*pdata->subdev_info),
|
||||
GFP_KERNEL);
|
||||
|
||||
if (!pdata->subdev_info)
|
||||
return NULL;
|
||||
@ -1546,9 +1548,9 @@ vpif_capture_get_pdata(struct platform_device *pdev)
|
||||
|
||||
sdinfo = &pdata->subdev_info[i];
|
||||
chan = &pdata->chan_config[i];
|
||||
chan->inputs = devm_kzalloc(&pdev->dev,
|
||||
sizeof(*chan->inputs) *
|
||||
chan->inputs = devm_kcalloc(&pdev->dev,
|
||||
VPIF_CAPTURE_NUM_CHANNELS,
|
||||
sizeof(*chan->inputs),
|
||||
GFP_KERNEL);
|
||||
if (!chan->inputs)
|
||||
return NULL;
|
||||
|
@ -845,7 +845,7 @@ int msm_csid_subdev_init(struct csid_device *csid,
|
||||
while (res->clock[csid->nclocks])
|
||||
csid->nclocks++;
|
||||
|
||||
csid->clock = devm_kzalloc(dev, csid->nclocks * sizeof(*csid->clock),
|
||||
csid->clock = devm_kcalloc(dev, csid->nclocks, sizeof(*csid->clock),
|
||||
GFP_KERNEL);
|
||||
if (!csid->clock)
|
||||
return -ENOMEM;
|
||||
@ -868,8 +868,10 @@ int msm_csid_subdev_init(struct csid_device *csid,
|
||||
continue;
|
||||
}
|
||||
|
||||
clock->freq = devm_kzalloc(dev, clock->nfreqs *
|
||||
sizeof(*clock->freq), GFP_KERNEL);
|
||||
clock->freq = devm_kcalloc(dev,
|
||||
clock->nfreqs,
|
||||
sizeof(*clock->freq),
|
||||
GFP_KERNEL);
|
||||
if (!clock->freq)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -732,8 +732,9 @@ int msm_csiphy_subdev_init(struct csiphy_device *csiphy,
|
||||
while (res->clock[csiphy->nclocks])
|
||||
csiphy->nclocks++;
|
||||
|
||||
csiphy->clock = devm_kzalloc(dev, csiphy->nclocks *
|
||||
sizeof(*csiphy->clock), GFP_KERNEL);
|
||||
csiphy->clock = devm_kcalloc(dev,
|
||||
csiphy->nclocks, sizeof(*csiphy->clock),
|
||||
GFP_KERNEL);
|
||||
if (!csiphy->clock)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -755,8 +756,10 @@ int msm_csiphy_subdev_init(struct csiphy_device *csiphy,
|
||||
continue;
|
||||
}
|
||||
|
||||
clock->freq = devm_kzalloc(dev, clock->nfreqs *
|
||||
sizeof(*clock->freq), GFP_KERNEL);
|
||||
clock->freq = devm_kcalloc(dev,
|
||||
clock->nfreqs,
|
||||
sizeof(*clock->freq),
|
||||
GFP_KERNEL);
|
||||
if (!clock->freq)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -948,7 +948,8 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
|
||||
while (res->clock[ispif->nclocks])
|
||||
ispif->nclocks++;
|
||||
|
||||
ispif->clock = devm_kzalloc(dev, ispif->nclocks * sizeof(*ispif->clock),
|
||||
ispif->clock = devm_kcalloc(dev,
|
||||
ispif->nclocks, sizeof(*ispif->clock),
|
||||
GFP_KERNEL);
|
||||
if (!ispif->clock)
|
||||
return -ENOMEM;
|
||||
@ -968,8 +969,10 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
|
||||
while (res->clock_for_reset[ispif->nclocks_for_reset])
|
||||
ispif->nclocks_for_reset++;
|
||||
|
||||
ispif->clock_for_reset = devm_kzalloc(dev, ispif->nclocks_for_reset *
|
||||
sizeof(*ispif->clock_for_reset), GFP_KERNEL);
|
||||
ispif->clock_for_reset = devm_kcalloc(dev,
|
||||
ispif->nclocks_for_reset,
|
||||
sizeof(*ispif->clock_for_reset),
|
||||
GFP_KERNEL);
|
||||
if (!ispif->clock_for_reset)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -2794,7 +2794,7 @@ int msm_vfe_subdev_init(struct vfe_device *vfe, const struct resources *res)
|
||||
while (res->clock[vfe->nclocks])
|
||||
vfe->nclocks++;
|
||||
|
||||
vfe->clock = devm_kzalloc(dev, vfe->nclocks * sizeof(*vfe->clock),
|
||||
vfe->clock = devm_kcalloc(dev, vfe->nclocks, sizeof(*vfe->clock),
|
||||
GFP_KERNEL);
|
||||
if (!vfe->clock)
|
||||
return -ENOMEM;
|
||||
@ -2817,8 +2817,10 @@ int msm_vfe_subdev_init(struct vfe_device *vfe, const struct resources *res)
|
||||
continue;
|
||||
}
|
||||
|
||||
clock->freq = devm_kzalloc(dev, clock->nfreqs *
|
||||
sizeof(*clock->freq), GFP_KERNEL);
|
||||
clock->freq = devm_kcalloc(dev,
|
||||
clock->nfreqs,
|
||||
sizeof(*clock->freq),
|
||||
GFP_KERNEL);
|
||||
if (!clock->freq)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -271,7 +271,8 @@ static int camss_of_parse_endpoint_node(struct device *dev,
|
||||
lncfg->clk.pol = mipi_csi2->lane_polarities[0];
|
||||
lncfg->num_data = mipi_csi2->num_data_lanes;
|
||||
|
||||
lncfg->data = devm_kzalloc(dev, lncfg->num_data * sizeof(*lncfg->data),
|
||||
lncfg->data = devm_kcalloc(dev,
|
||||
lncfg->num_data, sizeof(*lncfg->data),
|
||||
GFP_KERNEL);
|
||||
if (!lncfg->data)
|
||||
return -ENOMEM;
|
||||
|
@ -630,7 +630,8 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
|
||||
entity->source_pad = num_pads - 1;
|
||||
|
||||
/* Allocate and initialize pads. */
|
||||
entity->pads = devm_kzalloc(vsp1->dev, num_pads * sizeof(*entity->pads),
|
||||
entity->pads = devm_kcalloc(vsp1->dev,
|
||||
num_pads, sizeof(*entity->pads),
|
||||
GFP_KERNEL);
|
||||
if (entity->pads == NULL)
|
||||
return -ENOMEM;
|
||||
|
@ -532,7 +532,7 @@ static int xvip_graph_init(struct xvip_composite_device *xdev)
|
||||
|
||||
/* Register the subdevices notifier. */
|
||||
num_subdevs = xdev->num_subdevs;
|
||||
subdevs = devm_kzalloc(xdev->dev, sizeof(*subdevs) * num_subdevs,
|
||||
subdevs = devm_kcalloc(xdev->dev, num_subdevs, sizeof(*subdevs),
|
||||
GFP_KERNEL);
|
||||
if (subdevs == NULL) {
|
||||
ret = -ENOMEM;
|
||||
|
@ -412,9 +412,10 @@ static int v4l2_flash_init_controls(struct v4l2_flash *v4l2_flash,
|
||||
struct v4l2_ctrl_config *ctrl_cfg;
|
||||
int i, ret, num_ctrls = 0;
|
||||
|
||||
v4l2_flash->ctrls = devm_kzalloc(v4l2_flash->sd.dev,
|
||||
sizeof(*v4l2_flash->ctrls) *
|
||||
(STROBE_SOURCE + 1), GFP_KERNEL);
|
||||
v4l2_flash->ctrls = devm_kcalloc(v4l2_flash->sd.dev,
|
||||
STROBE_SOURCE + 1,
|
||||
sizeof(*v4l2_flash->ctrls),
|
||||
GFP_KERNEL);
|
||||
if (!v4l2_flash->ctrls)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -126,8 +126,8 @@ const struct lpddr2_timings *of_get_ddr_timings(struct device_node *np_ddr,
|
||||
arr_sz++;
|
||||
|
||||
if (arr_sz)
|
||||
timings = devm_kzalloc(dev, sizeof(*timings) * arr_sz,
|
||||
GFP_KERNEL);
|
||||
timings = devm_kcalloc(dev, arr_sz, sizeof(*timings),
|
||||
GFP_KERNEL);
|
||||
|
||||
if (!timings)
|
||||
goto default_timings;
|
||||
|
@ -2659,18 +2659,18 @@ static int ab8500_debug_probe(struct platform_device *plf)
|
||||
ab8500 = dev_get_drvdata(plf->dev.parent);
|
||||
num_irqs = ab8500->mask_size;
|
||||
|
||||
irq_count = devm_kzalloc(&plf->dev,
|
||||
sizeof(*irq_count)*num_irqs, GFP_KERNEL);
|
||||
irq_count = devm_kcalloc(&plf->dev,
|
||||
num_irqs, sizeof(*irq_count), GFP_KERNEL);
|
||||
if (!irq_count)
|
||||
return -ENOMEM;
|
||||
|
||||
dev_attr = devm_kzalloc(&plf->dev,
|
||||
sizeof(*dev_attr)*num_irqs, GFP_KERNEL);
|
||||
dev_attr = devm_kcalloc(&plf->dev,
|
||||
num_irqs, sizeof(*dev_attr), GFP_KERNEL);
|
||||
if (!dev_attr)
|
||||
return -ENOMEM;
|
||||
|
||||
event_name = devm_kzalloc(&plf->dev,
|
||||
sizeof(*event_name)*num_irqs, GFP_KERNEL);
|
||||
event_name = devm_kcalloc(&plf->dev,
|
||||
num_irqs, sizeof(*event_name), GFP_KERNEL);
|
||||
if (!event_name)
|
||||
return -ENOMEM;
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user