diff options
| author | Kees Cook <kees@kernel.org> | 2026-02-21 23:46:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-22 08:26:33 -0800 |
| commit | 189f164e573e18d9f8876dbd3ad8fcbe11f93037 (patch) | |
| tree | 733382723a15ea29b7c9f3dde3bcb281f0b3c287 /drivers/net | |
| parent | 32a92f8c89326985e05dce8b22d3f0aa07a3e1bd (diff) | |
| download | lwn-189f164e573e18d9f8876dbd3ad8fcbe11f93037.tar.gz lwn-189f164e573e18d9f8876dbd3ad8fcbe11f93037.zip | |
Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses
Conversion performed via this Coccinelle script:
// SPDX-License-Identifier: GPL-2.0-only
// Options: --include-headers-for-types --all-includes --include-headers --keep-comments
virtual patch
@gfp depends on patch && !(file in "tools") && !(file in "samples")@
identifier ALLOC = {kmalloc_obj,kmalloc_objs,kmalloc_flex,
kzalloc_obj,kzalloc_objs,kzalloc_flex,
kvmalloc_obj,kvmalloc_objs,kvmalloc_flex,
kvzalloc_obj,kvzalloc_objs,kvzalloc_flex};
@@
ALLOC(...
- , GFP_KERNEL
)
$ make coccicheck MODE=patch COCCI=gfp.cocci
Build and boot tested x86_64 with Fedora 42's GCC and Clang:
Linux version 6.19.0+ (user@host) (gcc (GCC) 15.2.1 20260123 (Red Hat 15.2.1-7), GNU ld version 2.44-12.fc42) #1 SMP PREEMPT_DYNAMIC 1970-01-01
Linux version 6.19.0+ (user@host) (clang version 20.1.8 (Fedora 20.1.8-4.fc42), LLD 20.1.8) #1 SMP PREEMPT_DYNAMIC 1970-01-01
Signed-off-by: Kees Cook <kees@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
122 files changed, 183 insertions, 237 deletions
diff --git a/drivers/net/can/usb/ucan.c b/drivers/net/can/usb/ucan.c index 906aca08cf5c..c79508b1c43e 100644 --- a/drivers/net/can/usb/ucan.c +++ b/drivers/net/can/usb/ucan.c @@ -331,7 +331,7 @@ static int ucan_alloc_context_array(struct ucan_priv *up) ucan_release_context_array(up); up->context_array = kzalloc_objs(*up->context_array, - up->device_info.tx_fifo, GFP_KERNEL); + up->device_info.tx_fifo); if (!up->context_array) { netdev_err(up->netdev, "Not enough memory to allocate tx contexts\n"); diff --git a/drivers/net/dsa/mv88e6xxx/devlink.c b/drivers/net/dsa/mv88e6xxx/devlink.c index f241e7df6eb5..0f84bffc8ef1 100644 --- a/drivers/net/dsa/mv88e6xxx/devlink.c +++ b/drivers/net/dsa/mv88e6xxx/devlink.c @@ -379,7 +379,7 @@ static int mv88e6xxx_region_atu_snapshot(struct devlink *dl, int fid = -1, err = 0, count = 0; table = kzalloc_objs(struct mv88e6xxx_devlink_atu_entry, - mv88e6xxx_num_databases(chip), GFP_KERNEL); + mv88e6xxx_num_databases(chip)); if (!table) return -ENOMEM; @@ -440,7 +440,7 @@ static int mv88e6xxx_region_vtu_snapshot(struct devlink *dl, int err; table = kzalloc_objs(struct mv88e6xxx_devlink_vtu_entry, - mv88e6xxx_max_vid(chip) + 1, GFP_KERNEL); + mv88e6xxx_max_vid(chip) + 1); if (!table) return -ENOMEM; @@ -522,7 +522,7 @@ static int mv88e6xxx_region_stu_snapshot(struct devlink *dl, int err; table = kzalloc_objs(struct mv88e6xxx_devlink_stu_entry, - mv88e6xxx_max_sid(chip) + 1, GFP_KERNEL); + mv88e6xxx_max_sid(chip) + 1); if (!table) return -ENOMEM; diff --git a/drivers/net/dsa/sja1105/sja1105_vl.c b/drivers/net/dsa/sja1105/sja1105_vl.c index 7dd544fe26c6..0ae9cb5ea8d1 100644 --- a/drivers/net/dsa/sja1105/sja1105_vl.c +++ b/drivers/net/dsa/sja1105/sja1105_vl.c @@ -636,7 +636,7 @@ int sja1105_vl_gate(struct sja1105_private *priv, int port, rule->vl.cycle_time = cycle_time; rule->vl.num_entries = num_entries; rule->vl.entries = kzalloc_objs(struct action_gate_entry, - num_entries, GFP_KERNEL); + num_entries); if (!rule->vl.entries) { rc = -ENOMEM; goto out; diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c index af2f2c7f5de5..705cab7b0727 100644 --- a/drivers/net/ethernet/amd/pds_core/core.c +++ b/drivers/net/ethernet/amd/pds_core/core.c @@ -416,8 +416,7 @@ static int pdsc_viftypes_init(struct pdsc *pdsc) enum pds_core_vif_types vt; pdsc->viftype_status = kzalloc_objs(*pdsc->viftype_status, - ARRAY_SIZE(pdsc_viftype_defaults), - GFP_KERNEL); + ARRAY_SIZE(pdsc_viftype_defaults)); if (!pdsc->viftype_status) return -ENOMEM; diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index 8c3dd7331bfd..19e078479b0d 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -4583,8 +4583,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index) index, cos); txdata->tx_buf_ring = kzalloc_objs(struct sw_tx_bd, - NUM_TX_BD, - GFP_KERNEL); + NUM_TX_BD); if (!txdata->tx_buf_ring) goto alloc_mem_err; txdata->tx_desc_ring = BNX2X_PCI_ALLOC(&txdata->tx_desc_mapping, @@ -4752,8 +4751,7 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp) for (i = 0; i < bp->fp_array_size; i++) { fp[i].tpa_info = kzalloc_objs(struct bnx2x_agg_info, - ETH_MAX_AGGREGATION_QUEUES_E1H_E2, - GFP_KERNEL); + ETH_MAX_AGGREGATION_QUEUES_E1H_E2); if (!(fp[i].tpa_info)) goto alloc_err; } diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c index b638f94094a9..b8af508f9c98 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c @@ -1273,7 +1273,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param, /* allocate the queue arrays for all VFs */ bp->vfdb->vfqs = kzalloc_objs(struct bnx2x_vf_queue, - BNX2X_MAX_NUM_VF_QUEUES, GFP_KERNEL); + BNX2X_MAX_NUM_VF_QUEUES); if (!bp->vfdb->vfqs) { BNX2X_ERR("failed to allocate vf queue array\n"); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index c2f05a9abb88..e062d5d400da 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -4624,7 +4624,7 @@ static int bnxt_init_ring_grps(struct bnxt *bp, bool irq_re_init) if (irq_re_init) { bp->grp_info = kzalloc_objs(struct bnxt_ring_grp_info, - bp->cp_nr_rings, GFP_KERNEL); + bp->cp_nr_rings); if (!bp->grp_info) return -ENOMEM; } @@ -5511,7 +5511,7 @@ static int bnxt_alloc_mem(struct bnxt *bp, bool irq_re_init) } bp->rx_ring = kzalloc_objs(struct bnxt_rx_ring_info, - bp->rx_nr_rings, GFP_KERNEL); + bp->rx_nr_rings); if (!bp->rx_ring) return -ENOMEM; @@ -5531,7 +5531,7 @@ static int bnxt_alloc_mem(struct bnxt *bp, bool irq_re_init) } bp->tx_ring = kzalloc_objs(struct bnxt_tx_ring_info, - bp->tx_nr_rings, GFP_KERNEL); + bp->tx_nr_rings); if (!bp->tx_ring) return -ENOMEM; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c index 0135c53d4b47..53f336db4fcc 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c @@ -984,7 +984,7 @@ static int bnxt_ptp_pps_init(struct bnxt *bp) pps_info->num_pins = resp->num_pins; ptp_info->n_pins = pps_info->num_pins; ptp_info->pin_config = kzalloc_objs(*ptp_info->pin_config, - ptp_info->n_pins, GFP_KERNEL); + ptp_info->n_pins); if (!ptp_info->pin_config) { hwrm_req_drop(bp, req); return -ENOMEM; diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c index a8dca32ba877..c839dd9804d3 100644 --- a/drivers/net/ethernet/broadcom/sb1250-mac.c +++ b/drivers/net/ethernet/broadcom/sb1250-mac.c @@ -623,8 +623,7 @@ static void sbdma_initctx(struct sbmacdma *d, struct sbmac_softc *s, int chan, d->sbdma_maxdescr = maxdescr; d->sbdma_dscrtable_unaligned = kzalloc_objs(*d->sbdma_dscrtable, - d->sbdma_maxdescr + 1, - GFP_KERNEL); + d->sbdma_maxdescr + 1); /* * The descriptor table must be aligned to at least 16 bytes or the diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 746c95dc11cd..2328fce33644 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -8730,7 +8730,7 @@ static int tg3_mem_tx_acquire(struct tg3 *tp) for (i = 0; i < tp->txq_cnt; i++, tnapi++) { tnapi->tx_buffers = kzalloc_objs(struct tg3_tx_ring_info, - TG3_TX_RING_SIZE, GFP_KERNEL); + TG3_TX_RING_SIZE); if (!tnapi->tx_buffers) goto err_out; diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index 5743c9a98005..8e19add764db 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -1458,7 +1458,7 @@ bnad_txrx_irq_alloc(struct bnad *bnad, enum bnad_intr_source src, if (cfg_flags & BNAD_CF_MSIX) { intr_info->intr_type = BNA_INTR_T_MSIX; intr_info->idl = kzalloc_objs(struct bna_intr_descr, - intr_info->num, GFP_KERNEL); + intr_info->num); if (!intr_info->idl) return -ENOMEM; @@ -1483,7 +1483,7 @@ bnad_txrx_irq_alloc(struct bnad *bnad, enum bnad_intr_source src, intr_info->intr_type = BNA_INTR_T_INTX; intr_info->num = 1; intr_info->idl = kzalloc_objs(struct bna_intr_descr, - intr_info->num, GFP_KERNEL); + intr_info->num); if (!intr_info->idl) return -ENOMEM; diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c index 6062497827ac..93b06d599eed 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c @@ -1050,7 +1050,7 @@ int octeon_setup_interrupt(struct octeon_device *oct, u32 num_ioqs) [IRQ_NAME_OFF(MAX_IOQ_INTERRUPTS_PER_PF)]; oct->msix_entries = kzalloc_objs(struct msix_entry, - oct->num_msix_irqs, GFP_KERNEL); + oct->num_msix_irqs); if (!oct->msix_entries) { dev_err(&oct->pci_dev->dev, "Memory Alloc failed...\n"); kfree(oct->irq_name_storage); diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 0055ca7236e1..10694d5924ee 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -5028,7 +5028,7 @@ static int adap_init0(struct adapter *adap, int vpd_skip) } adap->sge.ingr_map = kzalloc_objs(*adap->sge.ingr_map, - adap->sge.ingr_sz, GFP_KERNEL); + adap->sge.ingr_sz); if (!adap->sge.ingr_map) { ret = -ENOMEM; goto bye; @@ -6349,8 +6349,7 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs) } /* Allocate and set up VF Information. */ adap->vfinfo = kzalloc_objs(struct vf_info, - pci_sriov_get_totalvfs(pdev), - GFP_KERNEL); + pci_sriov_get_totalvfs(pdev)); if (!adap->vfinfo) { unregister_netdev(adap->port[0]); free_netdev(adap->port[0]); diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c index b826eb2827aa..0f67d94e7f3b 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c @@ -157,12 +157,12 @@ static int cxgb4_mqprio_alloc_hw_resources(struct net_device *dev) /* Allocate ETHOFLD hardware queue structures if not done already */ if (!refcount_read(&adap->tc_mqprio->refcnt)) { adap->sge.eohw_rxq = kzalloc_objs(struct sge_ofld_rxq, - adap->sge.eoqsets, GFP_KERNEL); + adap->sge.eoqsets); if (!adap->sge.eohw_rxq) return -ENOMEM; adap->sge.eohw_txq = kzalloc_objs(struct sge_eohw_txq, - adap->sge.eoqsets, GFP_KERNEL); + adap->sge.eoqsets); if (!adap->sge.eohw_txq) { kfree(adap->sge.eohw_rxq); return -ENOMEM; diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index bfc76b5f5350..e839081f9ee4 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -2469,7 +2469,7 @@ static int enic_alloc_enic_resources(struct enic *enic) goto free_queues; enic->napi = kzalloc_objs(struct napi_struct, - enic->wq_avail + enic->rq_avail, GFP_KERNEL); + enic->wq_avail + enic->rq_avail); if (!enic->napi) goto free_queues; diff --git a/drivers/net/ethernet/engleder/tsnep_main.c b/drivers/net/ethernet/engleder/tsnep_main.c index eddfde68d503..5db04e209dc6 100644 --- a/drivers/net/ethernet/engleder/tsnep_main.c +++ b/drivers/net/ethernet/engleder/tsnep_main.c @@ -2103,11 +2103,11 @@ int tsnep_enable_xsk(struct tsnep_queue *queue, struct xsk_buff_pool *pool) return -EOPNOTSUPP; queue->rx->page_buffer = kzalloc_objs(*queue->rx->page_buffer, - TSNEP_RING_SIZE, GFP_KERNEL); + TSNEP_RING_SIZE); if (!queue->rx->page_buffer) return -ENOMEM; queue->rx->xdp_batch = kzalloc_objs(*queue->rx->xdp_batch, - TSNEP_RING_SIZE, GFP_KERNEL); + TSNEP_RING_SIZE); if (!queue->rx->xdp_batch) { kfree(queue->rx->page_buffer); queue->rx->page_buffer = NULL; diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c index b65bc54ffc03..8775c931106b 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c @@ -243,8 +243,7 @@ int dpaa2_eth_dl_traps_register(struct dpaa2_eth_priv *priv) priv->trap_data = dpaa2_eth_trap_data; dpaa2_eth_trap_data->trap_items_arr = kzalloc_objs(struct dpaa2_eth_trap_item, - ARRAY_SIZE(dpaa2_eth_traps_arr), - GFP_KERNEL); + ARRAY_SIZE(dpaa2_eth_traps_arr)); if (!dpaa2_eth_trap_data->trap_items_arr) { err = -ENOMEM; goto trap_data_free; diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c index 91adbb5cba92..def2dd231d1f 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c @@ -3421,7 +3421,7 @@ static int dpaa2_switch_probe(struct fsl_mc_device *sw_dev) } ethsw->filter_blocks = kzalloc_objs(*ethsw->filter_blocks, - ethsw->sw_attr.num_ifs, GFP_KERNEL); + ethsw->sw_attr.num_ifs); if (!ethsw->filter_blocks) { err = -ENOMEM; goto err_free_fdbs; diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c index 43b0af59d044..a12fd54a475f 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c @@ -959,7 +959,7 @@ static int enetc_pf_probe(struct pci_dev *pdev, pf->total_vfs = pci_sriov_get_totalvfs(pdev); if (pf->total_vfs) { pf->vf_state = kzalloc_objs(struct enetc_vf_state, - pf->total_vfs, GFP_KERNEL); + pf->total_vfs); if (!pf->vf_state) goto err_alloc_vf_state; } diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index c0a495e2a6bd..3271de5844f8 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -1374,7 +1374,7 @@ static int gfar_alloc_skb_resources(struct net_device *ndev) tx_queue = priv->tx_queue[i]; tx_queue->tx_skbuff = kmalloc_objs(*tx_queue->tx_skbuff, - tx_queue->tx_ring_size, GFP_KERNEL); + tx_queue->tx_ring_size); if (!tx_queue->tx_skbuff) goto cleanup; @@ -1385,8 +1385,7 @@ static int gfar_alloc_skb_resources(struct net_device *ndev) for (i = 0; i < priv->num_rx_queues; i++) { rx_queue = priv->rx_queue[i]; rx_queue->rx_buff = kzalloc_objs(*rx_queue->rx_buff, - rx_queue->rx_ring_size, - GFP_KERNEL); + rx_queue->rx_ring_size); if (!rx_queue->rx_buff) goto cleanup; } diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c index 684094118117..3607681650ce 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c @@ -2072,7 +2072,7 @@ static int ucc_geth_alloc_tx(struct ucc_geth_private *ugeth) /* Setup the skbuff rings */ ugeth->tx_skbuff[j] = kzalloc_objs(struct sk_buff *, - ugeth->ug_info->bdRingLenTx[j], GFP_KERNEL); + ugeth->ug_info->bdRingLenTx[j]); if (ugeth->tx_skbuff[j] == NULL) { if (netif_msg_ifup(ugeth)) @@ -2130,7 +2130,7 @@ static int ucc_geth_alloc_rx(struct ucc_geth_private *ugeth) /* Setup the skbuff rings */ ugeth->rx_skbuff[j] = kzalloc_objs(struct sk_buff *, - ugeth->ug_info->bdRingLenRx[j], GFP_KERNEL); + ugeth->ug_info->bdRingLenRx[j]); if (ugeth->rx_skbuff[j] == NULL) { if (netif_msg_ifup(ugeth)) diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 9d4ef4d42be3..9eb4b3614c4f 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -152,7 +152,7 @@ static int gve_alloc_flow_rule_caches(struct gve_priv *priv) flow_rules_cache->rules_cache = kvzalloc_objs(*flow_rules_cache->rules_cache, - GVE_FLOW_RULES_CACHE_SIZE, GFP_KERNEL); + GVE_FLOW_RULES_CACHE_SIZE); if (!flow_rules_cache->rules_cache) { dev_err(&priv->pdev->dev, "Cannot alloc flow rules cache\n"); return -ENOMEM; @@ -486,7 +486,7 @@ static int gve_alloc_notify_blocks(struct gve_priv *priv) int err; priv->msix_vectors = kvzalloc_objs(*priv->msix_vectors, - num_vecs_requested, GFP_KERNEL); + num_vecs_requested); if (!priv->msix_vectors) return -ENOMEM; for (i = 0; i < num_vecs_requested; i++) diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet/google/gve/gve_tx_dqo.c index 529ab21a3b56..9031dd619f68 100644 --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c @@ -267,7 +267,7 @@ static int gve_tx_qpl_buf_init(struct gve_tx_ring *tx) int i; tx->dqo.tx_qpl_buf_next = kvzalloc_objs(tx->dqo.tx_qpl_buf_next[0], - num_tx_qpl_bufs, GFP_KERNEL); + num_tx_qpl_bufs); if (!tx->dqo.tx_qpl_buf_next) return -ENOMEM; @@ -337,8 +337,7 @@ static int gve_tx_alloc_ring_dqo(struct gve_priv *priv, tx->dqo.num_pending_packets = min_t(int, num_pending_packets, S16_MAX); tx->dqo.pending_packets = kvzalloc_objs(tx->dqo.pending_packets[0], - tx->dqo.num_pending_packets, - GFP_KERNEL); + tx->dqo.num_pending_packets); if (!tx->dqo.pending_packets) goto err; diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c index dbc6d5c6644c..9cb7ce9fd311 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -1100,7 +1100,7 @@ static struct hns3_enet_ring *hns3_backup_ringparam(struct hns3_nic_priv *priv) int i; tmp_rings = kzalloc_objs(struct hns3_enet_ring, - handle->kinfo.num_tqps * 2, GFP_KERNEL); + handle->kinfo.num_tqps * 2); if (!tmp_rings) return NULL; diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_main.c b/drivers/net/ethernet/huawei/hinic3/hinic3_main.c index 3c9efe037793..6039fcf3c1dd 100644 --- a/drivers/net/ethernet/huawei/hinic3/hinic3_main.c +++ b/drivers/net/ethernet/huawei/hinic3/hinic3_main.c @@ -58,7 +58,7 @@ static int hinic3_init_intr_coalesce(struct net_device *netdev) struct hinic3_nic_dev *nic_dev = netdev_priv(netdev); nic_dev->intr_coalesce = kzalloc_objs(*nic_dev->intr_coalesce, - nic_dev->max_qps, GFP_KERNEL); + nic_dev->max_qps); if (!nic_dev->intr_coalesce) return -ENOMEM; diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c b/drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c index 8a1ad3ed42bd..cabb8523f246 100644 --- a/drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c +++ b/drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c @@ -100,7 +100,7 @@ static int hinic3_setup_num_qps(struct net_device *netdev) nic_dev->num_qp_irq = 0; nic_dev->qps_msix_entries = kzalloc_objs(struct msix_entry, - nic_dev->max_qps, GFP_KERNEL); + nic_dev->max_qps); if (!nic_dev->qps_msix_entries) return -ENOMEM; @@ -127,12 +127,12 @@ static int hinic3_alloc_txrxq_resources(struct net_device *netdev, int err; q_params->txqs_res = kzalloc_objs(*q_params->txqs_res, - q_params->num_qps, GFP_KERNEL); + q_params->num_qps); if (!q_params->txqs_res) return -ENOMEM; q_params->rxqs_res = kzalloc_objs(*q_params->rxqs_res, - q_params->num_qps, GFP_KERNEL); + q_params->num_qps); if (!q_params->rxqs_res) { err = -ENOMEM; goto err_free_txqs_res_arr; diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c b/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c index a25fd8799a2f..9306bf0020ca 100644 --- a/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c +++ b/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c @@ -686,8 +686,7 @@ int hinic3_alloc_txqs_res(struct net_device *netdev, u16 num_sq, goto err_free_tqres; tqres->bds = kzalloc_objs(*tqres->bds, - sq_depth * HINIC3_BDS_PER_SQ_WQEBB + HINIC3_MAX_SQ_SGE, - GFP_KERNEL); + sq_depth * HINIC3_BDS_PER_SQ_WQEBB + HINIC3_MAX_SQ_SGE); if (!tqres->bds) { kfree(tqres->tx_info); goto err_free_tqres; diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 37d8523ac05b..5a510eed335e 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -933,13 +933,13 @@ static int init_stats_buffers(struct ibmvnic_adapter *adapter) { adapter->tx_stats_buffers = kzalloc_objs(struct ibmvnic_tx_queue_stats, - IBMVNIC_MAX_QUEUES, GFP_KERNEL); + IBMVNIC_MAX_QUEUES); if (!adapter->tx_stats_buffers) return -ENOMEM; adapter->rx_stats_buffers = kzalloc_objs(struct ibmvnic_rx_queue_stats, - IBMVNIC_MAX_QUEUES, GFP_KERNEL); + IBMVNIC_MAX_QUEUES); if (!adapter->rx_stats_buffers) return -ENOMEM; @@ -1124,7 +1124,7 @@ static int init_rx_pools(struct net_device *netdev) } rx_pool->rx_buff = kzalloc_objs(struct ibmvnic_rx_buff, - rx_pool->size, GFP_KERNEL); + rx_pool->size); if (!rx_pool->rx_buff) { dev_err(dev, "Couldn't alloc rx buffers\n"); rc = -ENOMEM; @@ -4476,7 +4476,7 @@ static int init_sub_crqs(struct ibmvnic_adapter *adapter) } adapter->tx_scrq = kzalloc_objs(*adapter->tx_scrq, - adapter->req_tx_queues, GFP_KERNEL); + adapter->req_tx_queues); if (!adapter->tx_scrq) goto tx_failed; @@ -4487,7 +4487,7 @@ static int init_sub_crqs(struct ibmvnic_adapter *adapter) } adapter->rx_scrq = kzalloc_objs(*adapter->rx_scrq, - adapter->req_rx_queues, GFP_KERNEL); + adapter->req_rx_queues); if (!adapter->rx_scrq) goto rx_failed; diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index b0ecd3413ffb..3d7648a119e5 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -1323,12 +1323,12 @@ static int e1000_sw_init(struct e1000_adapter *adapter) static int e1000_alloc_queues(struct e1000_adapter *adapter) { adapter->tx_ring = kzalloc_objs(struct e1000_tx_ring, - adapter->num_tx_queues, GFP_KERNEL); + adapter->num_tx_queues); if (!adapter->tx_ring) return -ENOMEM; adapter->rx_ring = kzalloc_objs(struct e1000_rx_ring, - adapter->num_rx_queues, GFP_KERNEL); + adapter->num_rx_queues); if (!adapter->rx_ring) { kfree(adapter->tx_ring); return -ENOMEM; diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index edd503b79f98..fd4b117ed20f 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -2051,8 +2051,7 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter) if (adapter->flags & FLAG_HAS_MSIX) { adapter->num_vectors = 3; /* RxQ0, TxQ0 and other */ adapter->msix_entries = kzalloc_objs(struct msix_entry, - adapter->num_vectors, - GFP_KERNEL); + adapter->num_vectors); if (adapter->msix_entries) { struct e1000_adapter *a = adapter; @@ -2370,8 +2369,7 @@ int e1000e_setup_rx_resources(struct e1000_ring *rx_ring) for (i = 0; i < rx_ring->count; i++) { buffer_info = &rx_ring->buffer_info[i]; buffer_info->ps_pages = kzalloc_objs(struct e1000_ps_page, - PS_PAGE_BUFFERS, - GFP_KERNEL); + PS_PAGE_BUFFERS); if (!buffer_info->ps_pages) goto err_pages; } diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c index 906b8c01f8bc..84a97ca8a6d8 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_client.c +++ b/drivers/net/ethernet/intel/i40e/i40e_client.c @@ -567,7 +567,7 @@ static int i40e_client_setup_qvlist(struct i40e_info *ldev, u32 v_idx, i, reg_idx, reg; ldev->qvlist_info = kzalloc_flex(*ldev->qvlist_info, qv_info, - qvlist_info->num_vectors, GFP_KERNEL); + qvlist_info->num_vectors); if (!ldev->qvlist_info) return -ENOMEM; ldev->qvlist_info->num_vectors = qvlist_info->num_vectors; diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index 21c666dbb129..8c27f7ba4adc 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -2159,7 +2159,7 @@ static int i40e_set_ringparam(struct net_device *netdev, "Changing Rx descriptor count from %d to %d\n", vsi->rx_rings[0]->count, new_rx_count); rx_rings = kzalloc_objs(struct i40e_ring, - vsi->alloc_queue_pairs, GFP_KERNEL); + vsi->alloc_queue_pairs); if (!rx_rings) { err = -ENOMEM; goto free_tx; diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c index e3517490510f..404a716db8da 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c @@ -1345,7 +1345,7 @@ static int i40e_init_pin_config(struct i40e_pf *pf) pf->ptp_caps.n_per_out = 2; pf->ptp_caps.pin_config = kzalloc_objs(*pf->ptp_caps.pin_config, - pf->ptp_caps.n_pins, GFP_KERNEL); + pf->ptp_caps.n_pins); if (!pf->ptp_caps.pin_config) return -ENOMEM; diff --git a/drivers/net/ethernet/intel/ice/devlink/port.c b/drivers/net/ethernet/intel/ice/devlink/port.c index 0a0bd9019cfb..2a2e56777f9f 100644 --- a/drivers/net/ethernet/intel/ice/devlink/port.c +++ b/drivers/net/ethernet/intel/ice/devlink/port.c @@ -59,8 +59,7 @@ static void ice_devlink_port_options_print(struct ice_pf *pf) int status; options = kzalloc_objs(*options, - ICE_AQC_PORT_OPT_MAX * ICE_MAX_PORT_PER_PCI_DEV, - GFP_KERNEL); + ICE_AQC_PORT_OPT_MAX * ICE_MAX_PORT_PER_PCI_DEV); if (!options) return; diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c index e01eae07b6ed..c673094663a3 100644 --- a/drivers/net/ethernet/intel/ice/ice_xsk.c +++ b/drivers/net/ethernet/intel/ice/ice_xsk.c @@ -175,7 +175,7 @@ ice_realloc_rx_xdp_bufs(struct ice_rx_ring *rx_ring, bool pool_present) { if (pool_present) { rx_ring->xdp_buf = kzalloc_objs(*rx_ring->xdp_buf, - rx_ring->count, GFP_KERNEL); + rx_ring->count); if (!rx_ring->xdp_buf) return -ENOMEM; } else { diff --git a/drivers/net/ethernet/intel/idpf/idpf_idc.c b/drivers/net/ethernet/intel/idpf/idpf_idc.c index bb2367ab3279..bd4785fb8d3e 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_idc.c +++ b/drivers/net/ethernet/intel/idpf/idpf_idc.c @@ -432,7 +432,7 @@ int idpf_idc_init_aux_core_dev(struct idpf_adapter *adapter, privd->mapped_mem_regions = kzalloc_objs(struct iidc_rdma_lan_mapped_mem_region, - adapter->hw.num_lan_regs, GFP_KERNEL); + adapter->hw.num_lan_regs); if (!privd->mapped_mem_regions) { err = -ENOMEM; goto err_plug_aux_dev; diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c b/drivers/net/ethernet/intel/idpf/idpf_lib.c index 04fc8d309b04..de3df705a7e6 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_lib.c +++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c @@ -360,8 +360,7 @@ int idpf_intr_req(struct idpf_adapter *adapter) } adapter->rdma_msix_entries = kzalloc_objs(struct msix_entry, - num_rdma_vecs, - GFP_KERNEL); + num_rdma_vecs); if (!adapter->rdma_msix_entries) { err = -ENOMEM; goto free_irq; diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c index b3c0ae2ea6a3..05a162094d10 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c @@ -1204,8 +1204,7 @@ static int idpf_qp_enable(const struct idpf_vport *vport, goto config; q_vector->xsksq = kzalloc_objs(*q_vector->xsksq, - DIV_ROUND_UP(rsrc->num_rxq_grp, rsrc->num_q_vectors), - GFP_KERNEL); + DIV_ROUND_UP(rsrc->num_rxq_grp, rsrc->num_q_vectors)); if (!q_vector->xsksq) return -ENOMEM; @@ -1764,8 +1763,7 @@ static int idpf_txq_group_alloc(struct idpf_vport *vport, continue; tx_qgrp->complq = kzalloc_objs(*tx_qgrp->complq, - IDPF_COMPLQ_PER_GROUP, - GFP_KERNEL); + IDPF_COMPLQ_PER_GROUP); if (!tx_qgrp->complq) goto err_alloc; @@ -1836,8 +1834,7 @@ static int idpf_rxq_group_alloc(struct idpf_vport *vport, } rx_qgrp->splitq.bufq_sets = kzalloc_objs(struct idpf_bufq_set, - rsrc->num_bufqs_per_qgrp, - GFP_KERNEL); + rsrc->num_bufqs_per_qgrp); if (!rx_qgrp->splitq.bufq_sets) { err = -ENOMEM; goto err_alloc; @@ -1873,8 +1870,7 @@ static int idpf_rxq_group_alloc(struct idpf_vport *vport, idpf_queue_set(GEN_CHK, refillq); idpf_queue_set(RFL_GEN_CHK, refillq); refillq->ring = kzalloc_objs(*refillq->ring, - refillq->desc_count, - GFP_KERNEL); + refillq->desc_count); if (!refillq->ring) { err = -ENOMEM; goto err_alloc; @@ -4560,7 +4556,7 @@ int idpf_vport_intr_alloc(struct idpf_vport *vport, user_config = &vport->adapter->vport_config[idx]->user_config; rsrc->q_vectors = kzalloc_objs(struct idpf_q_vector, - rsrc->num_q_vectors, GFP_KERNEL); + rsrc->num_q_vectors); if (!rsrc->q_vectors) return -ENOMEM; @@ -4603,7 +4599,7 @@ int idpf_vport_intr_alloc(struct idpf_vport *vport, goto error; q_vector->complq = kzalloc_objs(*q_vector->complq, - complqs_per_vector, GFP_KERNEL); + complqs_per_vector); if (!q_vector->complq) goto error; @@ -4611,7 +4607,7 @@ int idpf_vport_intr_alloc(struct idpf_vport *vport, continue; q_vector->xsksq = kzalloc_objs(*q_vector->xsksq, - rxqs_per_vector, GFP_KERNEL); + rxqs_per_vector); if (!q_vector->xsksq) goto error; } diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c index 412f71306406..d5a877e1fef8 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c @@ -3433,12 +3433,12 @@ static int idpf_vport_params_buf_alloc(struct idpf_adapter *adapter) u16 num_max_vports = idpf_get_max_vports(adapter); adapter->vport_params_reqd = kzalloc_objs(*adapter->vport_params_reqd, - num_max_vports, GFP_KERNEL); + num_max_vports); if (!adapter->vport_params_reqd) return -ENOMEM; adapter->vport_params_recvd = kzalloc_objs(*adapter->vport_params_recvd, - num_max_vports, GFP_KERNEL); + num_max_vports); if (!adapter->vport_params_recvd) goto err_mem; @@ -3450,7 +3450,7 @@ static int idpf_vport_params_buf_alloc(struct idpf_adapter *adapter) return 0; adapter->vport_config = kzalloc_objs(*adapter->vport_config, - num_max_vports, GFP_KERNEL); + num_max_vports); if (!adapter->vport_config) goto err_mem; @@ -3560,7 +3560,7 @@ restart: if (!adapter->netdevs) { adapter->netdevs = kzalloc_objs(struct net_device *, - num_max_vports, GFP_KERNEL); + num_max_vports); if (!adapter->netdevs) { err = -ENOMEM; goto err_netdev_alloc; diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 223a10cae4a9..ee99fd8fd513 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -3776,8 +3776,7 @@ static int igb_enable_sriov(struct pci_dev *pdev, int num_vfs, bool reinit) adapter->vfs_allocated_count = num_vfs; adapter->vf_data = kzalloc_objs(struct vf_data_storage, - adapter->vfs_allocated_count, - GFP_KERNEL); + adapter->vfs_allocated_count); /* if allocation failed then we do not support SR-IOV */ if (!adapter->vf_data) { @@ -3796,7 +3795,7 @@ static int igb_enable_sriov(struct pci_dev *pdev, int num_vfs, bool reinit) adapter->vfs_allocated_count); adapter->vf_mac_list = kzalloc_objs(struct vf_mac_filter, - num_vf_mac_filters, GFP_KERNEL); + num_vf_mac_filters); mac_list = adapter->vf_mac_list; INIT_LIST_HEAD(&adapter->vf_macs.l); @@ -4092,7 +4091,7 @@ static int igb_sw_init(struct igb_adapter *adapter) adapter->flags |= IGB_FLAG_HAS_MSIX; adapter->mac_table = kzalloc_objs(struct igb_mac_addr, - hw->mac.rar_entry_count, GFP_KERNEL); + hw->mac.rar_entry_count); if (!adapter->mac_table) return -ENOMEM; diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 1e3ad275b88c..e4101c59074d 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -6904,7 +6904,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter, adapter->jump_tables[i] = NULL; adapter->mac_table = kzalloc_objs(struct ixgbe_mac_addr, - hw->mac.num_rar_entries, GFP_KERNEL); + hw->mac.num_rar_entries); if (!adapter->mac_table) return -ENOMEM; diff --git a/drivers/net/ethernet/intel/libie/fwlog.c b/drivers/net/ethernet/intel/libie/fwlog.c index fb61f98b8b30..79020d990859 100644 --- a/drivers/net/ethernet/intel/libie/fwlog.c +++ b/drivers/net/ethernet/intel/libie/fwlog.c @@ -1013,8 +1013,7 @@ int libie_fwlog_init(struct libie_fwlog *fwlog, struct libie_fwlog_api *api) return status; fwlog->ring.rings = kzalloc_objs(*fwlog->ring.rings, - LIBIE_FWLOG_RING_SIZE_DFLT, - GFP_KERNEL); + LIBIE_FWLOG_RING_SIZE_DFLT); if (!fwlog->ring.rings) { dev_warn(&fwlog->pdev->dev, "Unable to allocate memory for FW log rings\n"); return -ENOMEM; diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c index 29e7786c4434..ee623476e5ff 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c @@ -1950,7 +1950,7 @@ int otx2_alloc_queue_mem(struct otx2_nic *pf) goto err_free_mem; qset->sq = kzalloc_objs(struct otx2_snd_queue, - otx2_get_total_tx_queues(pf), GFP_KERNEL); + otx2_get_total_tx_queues(pf)); if (!qset->sq) goto err_free_mem; diff --git a/drivers/net/ethernet/marvell/prestera/prestera_devlink.c b/drivers/net/ethernet/marvell/prestera/prestera_devlink.c index 5fd78abccf25..33dea101bc67 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_devlink.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_devlink.c @@ -456,7 +456,7 @@ int prestera_devlink_traps_register(struct prestera_switch *sw) return -ENOMEM; trap_data->trap_items_arr = kzalloc_objs(struct prestera_trap_item, - traps_count, GFP_KERNEL); + traps_count); if (!trap_data->trap_items_arr) { err = -ENOMEM; goto err_trap_items_alloc; diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index 3aa5765139d8..de0193d82ec1 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c @@ -2374,7 +2374,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev) priv->mfunc.master.vf_admin = kzalloc_objs(struct mlx4_vf_admin_state, - dev->num_slaves, GFP_KERNEL); + dev->num_slaves); if (!priv->mfunc.master.vf_admin) goto err_comm_admin; @@ -2620,7 +2620,7 @@ int mlx4_cmd_use_events(struct mlx4_dev *dev) int err = 0; priv->cmd.context = kmalloc_objs(struct mlx4_cmd_context, - priv->cmd.max_cmds, GFP_KERNEL); + priv->cmd.max_cmds); if (!priv->cmd.context) return -ENOMEM; diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index b9b8142d99a3..071564c54522 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -2241,7 +2241,7 @@ static int mlx4_en_copy_priv(struct mlx4_en_priv *dst, continue; dst->tx_ring[t] = kzalloc_objs(struct mlx4_en_tx_ring *, - MAX_TX_RINGS, GFP_KERNEL); + MAX_TX_RINGS); if (!dst->tx_ring[t]) goto err_free_tx; @@ -3215,7 +3215,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, continue; priv->tx_ring[t] = kzalloc_objs(struct mlx4_en_tx_ring *, - MAX_TX_RINGS, GFP_KERNEL); + MAX_TX_RINGS); if (!priv->tx_ring[t]) { err = -ENOMEM; goto out; diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c index 2760db75b617..f1c3da04de7f 100644 --- a/drivers/net/ethernet/mellanox/mlx4/eq.c +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c @@ -1158,8 +1158,7 @@ int mlx4_alloc_eq_table(struct mlx4_dev *dev) struct mlx4_priv *priv = mlx4_priv(dev); priv->eq_table.eq = kzalloc_objs(*priv->eq_table.eq, - dev->caps.num_eqs - dev->caps.reserved_eqs, - GFP_KERNEL); + dev->caps.num_eqs - dev->caps.reserved_eqs); if (!priv->eq_table.eq) return -ENOMEM; @@ -1178,7 +1177,7 @@ int mlx4_init_eq_table(struct mlx4_dev *dev) int i; priv->eq_table.uar_map = kzalloc_objs(*priv->eq_table.uar_map, - mlx4_num_eq_uar(dev), GFP_KERNEL); + mlx4_num_eq_uar(dev)); if (!priv->eq_table.uar_map) { err = -ENOMEM; goto err_out_free; diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c index 2964334582ea..82e467c45d23 100644 --- a/drivers/net/ethernet/mellanox/mlx4/intf.c +++ b/drivers/net/ethernet/mellanox/mlx4/intf.c @@ -79,7 +79,7 @@ int mlx4_adev_init(struct mlx4_dev *dev) return priv->adev_idx; priv->adev = kzalloc_objs(struct mlx4_adev *, - ARRAY_SIZE(mlx4_adev_devices), GFP_KERNEL); + ARRAY_SIZE(mlx4_adev_devices)); if (!priv->adev) { ida_free(&mlx4_adev_ida, priv->adev_idx); return -ENOMEM; diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c index 436ed587b8b9..807a2f091aa6 100644 --- a/drivers/net/ethernet/mellanox/mlx4/qp.c +++ b/drivers/net/ethernet/mellanox/mlx4/qp.c @@ -854,8 +854,7 @@ int mlx4_init_qp_table(struct mlx4_dev *dev) /* In mfunc, calculate proxy and tunnel qp offsets for the PF here, * since the PF does not call mlx4_slave_caps */ dev->caps.spec_qps = kzalloc_objs(*dev->caps.spec_qps, - dev->caps.num_ports, - GFP_KERNEL); + dev->caps.num_ports); if (!dev->caps.spec_qps) { err = -ENOMEM; goto err_mem; diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index cdd9023e860a..83b88bb96f52 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -526,13 +526,11 @@ int mlx4_init_resource_tracker(struct mlx4_dev *dev) &priv->mfunc.master.res_tracker.res_alloc[i]; res_alloc->quota = kmalloc_objs(int, dev->persist->num_vfs + 1); res_alloc->guaranteed = kmalloc_objs(int, - dev->persist->num_vfs + 1, - GFP_KERNEL); + dev->persist->num_vfs + 1); if (i == RES_MAC || i == RES_VLAN) res_alloc->allocated = kzalloc_objs(int, - MLX4_MAX_PORTS * (dev->persist->num_vfs + 1), - GFP_KERNEL); + MLX4_MAX_PORTS * (dev->persist->num_vfs + 1)); else res_alloc->allocated = kzalloc_objs(int, dev->persist->num_vfs + 1); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c index 4bfbf52a46b4..df2e3ad01819 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c @@ -278,7 +278,7 @@ int mlx5_adev_init(struct mlx5_core_dev *dev) struct mlx5_priv *priv = &dev->priv; priv->adev = kzalloc_objs(struct mlx5_adev *, - ARRAY_SIZE(mlx5_adev_devices), GFP_KERNEL); + ARRAY_SIZE(mlx5_adev_devices)); if (!priv->adev) return -ENOMEM; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c index 1b2742174082..ac4979087e0d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c @@ -88,8 +88,7 @@ int mlx5e_open_qos_sq(struct mlx5e_priv *priv, struct mlx5e_channels *chs, struct mlx5e_sq_stats **stats_list; stats_list = kvzalloc_objs(*stats_list, - mlx5e_qos_max_leaf_nodes(priv->mdev), - GFP_KERNEL); + mlx5e_qos_max_leaf_nodes(priv->mdev)); if (!stats_list) return -ENOMEM; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c index c490a0287bff..26178d0bac92 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c @@ -917,7 +917,7 @@ esw_qos_create_vport_tc_sched_elements(struct mlx5_vport *vport, u32 rate_limit_elem_ix; vport->qos.sched_nodes = kzalloc_objs(struct mlx5_esw_sched_node *, - num_tcs, GFP_KERNEL); + num_tcs); if (!vport->qos.sched_nodes) { NL_SET_ERR_MSG_MOD(extack, "Allocating the vport TC scheduling elements failed."); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c index d0103b232c0c..2c3544880a30 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c @@ -3375,7 +3375,7 @@ static int init_rdma_transport_rx_root_ns(struct mlx5_flow_steering *steering) steering->rdma_transport_rx_root_ns = kzalloc_objs(*steering->rdma_transport_rx_root_ns, - total_vports, GFP_KERNEL); + total_vports); if (!steering->rdma_transport_rx_root_ns) return -ENOMEM; @@ -3407,7 +3407,7 @@ static int init_rdma_transport_tx_root_ns(struct mlx5_flow_steering *steering) steering->rdma_transport_tx_root_ns = kzalloc_objs(*steering->rdma_transport_tx_root_ns, - total_vports, GFP_KERNEL); + total_vports); if (!steering->rdma_transport_tx_root_ns) return -ENOMEM; @@ -3516,7 +3516,7 @@ static int create_fdb_fast_path(struct mlx5_flow_steering *steering) int err; steering->fdb_sub_ns = kzalloc_objs(*steering->fdb_sub_ns, - FDB_NUM_CHAINS, GFP_KERNEL); + FDB_NUM_CHAINS); if (!steering->fdb_sub_ns) return -ENOMEM; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/hwmon.c b/drivers/net/ethernet/mellanox/mlx5/core/hwmon.c index 189d87bd6de4..afcdebac9c4f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/hwmon.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/hwmon.c @@ -314,7 +314,7 @@ static struct mlx5_hwmon *mlx5_hwmon_alloc(struct mlx5_core_dev *mdev) hwmon->module_scount = mon_cap ? 1 : 0; sensors_count = hwmon->asic_platform_scount + hwmon->module_scount; hwmon->temp_channel_desc = kzalloc_objs(*hwmon->temp_channel_desc, - sensors_count, GFP_KERNEL); + sensors_count); if (!hwmon->temp_channel_desc) { err = -ENOMEM; goto err_free_hwmon; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c index 6ccffd6bc1f3..bd4e042077af 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c @@ -1083,7 +1083,7 @@ static void mlx5_init_pin_config(struct mlx5_core_dev *mdev) clock->ptp_info.pin_config = kzalloc_objs(*clock->ptp_info.pin_config, - clock->ptp_info.n_pins, GFP_KERNEL); + clock->ptp_info.n_pins); if (!clock->ptp_info.pin_config) return; clock->ptp_info.enable = mlx5_ptp_enable; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c index dea21c11ade7..6dcd9c2a78aa 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c @@ -254,8 +254,7 @@ int mlx5hws_bwc_matcher_create_simple(struct mlx5hws_bwc_matcher *bwc_matcher, bwc_matcher->size_of_at_array = MLX5HWS_BWC_MATCHER_ATTACH_AT_NUM; bwc_matcher->at = kzalloc_objs(*bwc_matcher->at, - bwc_matcher->size_of_at_array, - GFP_KERNEL); + bwc_matcher->size_of_at_array); if (!bwc_matcher->at) goto free_bwc_matcher_rules; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c index 367fb62458a5..aed009aec4fe 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c @@ -1034,7 +1034,7 @@ static int mlx5hws_send_queue_open(struct mlx5hws_context *ctx, queue->used_entries = 0; queue->completed.entries = kzalloc_objs(queue->completed.entries[0], - queue->num_entries, GFP_KERNEL); + queue->num_entries); if (!queue->completed.entries) return -ENOMEM; @@ -1094,13 +1094,13 @@ static int hws_bwc_send_queues_init(struct mlx5hws_context *ctx) ctx->queues += bwc_queues; ctx->bwc_send_queue_locks = kzalloc_objs(*ctx->bwc_send_queue_locks, - bwc_queues, GFP_KERNEL); + bwc_queues); if (!ctx->bwc_send_queue_locks) return -ENOMEM; ctx->bwc_lock_class_keys = kzalloc_objs(*ctx->bwc_lock_class_keys, - bwc_queues, GFP_KERNEL); + bwc_queues); if (!ctx->bwc_lock_class_keys) goto err_lock_class_keys; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c index d7c2074e9a89..7a0a15822392 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c @@ -548,7 +548,7 @@ struct mlx5dr_icm_pool *mlx5dr_icm_pool_create(struct mlx5dr_domain *dmn, pool->th = max_hot_size; pool->hot_chunks_arr = kvzalloc_objs(struct mlx5dr_icm_hot_chunk, - num_of_chunks, GFP_KERNEL); + num_of_chunks); if (!pool->hot_chunks_arr) goto free_pool; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.c index 2782e955d3ac..d15dcb30368f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.c @@ -282,7 +282,7 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, } fs_dr_actions = kzalloc_objs(*fs_dr_actions, - MLX5_FLOW_CONTEXT_ACTION_MAX, GFP_KERNEL); + MLX5_FLOW_CONTEXT_ACTION_MAX); if (!fs_dr_actions) { err = -ENOMEM; goto free_actions_alloc; diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 93540e4f3a4b..d76246301f67 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -151,7 +151,7 @@ static int mlxsw_ports_init(struct mlxsw_core *mlxsw_core, bool reload) mlxsw_core->max_ports = MLXSW_PORT_MAX_PORTS_DEFAULT + 1; mlxsw_core->ports = kzalloc_objs(struct mlxsw_core_port, - mlxsw_core->max_ports, GFP_KERNEL); + mlxsw_core->max_ports); if (!mlxsw_core->ports) return -ENOMEM; diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c index a937ac667ddd..ffef5310f8b0 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c @@ -1245,8 +1245,7 @@ static int mlxsw_env_line_cards_alloc(struct mlxsw_env *env) for (i = 0; i < env->num_of_slots; i++) { env->line_cards[i] = kzalloc_flex(*env->line_cards[i], module_info, - env->max_module_count, - GFP_KERNEL); + env->max_module_count); if (!env->line_cards[i]) goto kzalloc_err; diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c b/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c index f0659616ad9b..f801f04cafb7 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c @@ -1470,7 +1470,7 @@ static int mlxsw_linecard_types_init(struct mlxsw_core *mlxsw_core, } types_info->ini_files = kmalloc_objs(struct mlxsw_linecard_ini_file *, - types_info->count, GFP_KERNEL); + types_info->count); if (!types_info->ini_files) { err = -ENOMEM; goto err_ini_files_alloc; diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c index 3900a73cfffb..c43382cd1f72 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c @@ -432,7 +432,7 @@ mlxsw_thermal_modules_init(struct device *dev, struct mlxsw_core *core, return 0; area->tz_module_arr = kzalloc_objs(*area->tz_module_arr, - area->tz_module_num, GFP_KERNEL); + area->tz_module_num); if (!area->tz_module_arr) return -ENOMEM; @@ -522,7 +522,7 @@ mlxsw_thermal_gearboxes_init(struct device *dev, struct mlxsw_core *core, area->tz_gearbox_num = gbox_num; area->tz_gearbox_arr = kzalloc_objs(*area->tz_gearbox_arr, - area->tz_gearbox_num, GFP_KERNEL); + area->tz_gearbox_num); if (!area->tz_gearbox_arr) return -ENOMEM; diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c index 6cdbac750cc6..512933dbab9a 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c +++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c @@ -403,7 +403,7 @@ static int mlxsw_m_linecards_init(struct mlxsw_m *mlxsw_m) return -ENOMEM; mlxsw_m->line_cards = kzalloc_objs(*mlxsw_m->line_cards, - mlxsw_m->num_of_slots, GFP_KERNEL); + mlxsw_m->num_of_slots); if (!mlxsw_m->line_cards) { err = -ENOMEM; goto err_kcalloc; @@ -412,7 +412,7 @@ static int mlxsw_m_linecards_init(struct mlxsw_m *mlxsw_m) for (i = 0; i < mlxsw_m->num_of_slots; i++) { mlxsw_m->line_cards[i] = kzalloc_flex(*mlxsw_m->line_cards[i], module_to_port, - mlxsw_m->max_modules_per_slot, GFP_KERNEL); + mlxsw_m->max_modules_per_slot); if (!mlxsw_m->line_cards[i]) { err = -ENOMEM; goto err_kmalloc_array; diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 560f5ee531d2..3a65420fa1ad 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -2020,7 +2020,7 @@ static int mlxsw_sp_port_module_info_init(struct mlxsw_sp *mlxsw_sp) int err; mlxsw_sp->port_mapping = kzalloc_objs(struct mlxsw_sp_port_mapping, - max_ports, GFP_KERNEL); + max_ports); if (!mlxsw_sp->port_mapping) return -ENOMEM; diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum1_mr_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum1_mr_tcam.c index 814b704de294..ffde7c4fe140 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum1_mr_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum1_mr_tcam.c @@ -260,7 +260,7 @@ mlxsw_sp1_mr_tcam_region_init(struct mlxsw_sp *mlxsw_sp, mr_tcam_region->parman = parman; parman_prios = kmalloc_objs(*parman_prios, - MLXSW_SP_MR_ROUTE_PRIO_MAX + 1, GFP_KERNEL); + MLXSW_SP_MR_ROUTE_PRIO_MAX + 1); if (!parman_prios) { err = -ENOMEM; goto err_parman_prios_alloc; diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c index a4df29aab39d..73519301b744 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c @@ -366,8 +366,7 @@ static int mlxsw_sp_qdisc_create(struct mlxsw_sp_port *mlxsw_sp_port, if (ops->num_classes) { mlxsw_sp_qdisc->qdiscs = kzalloc_objs(*mlxsw_sp_qdisc->qdiscs, - ops->num_classes, - GFP_KERNEL); + ops->num_classes); if (!mlxsw_sp_qdisc->qdiscs) return -ENOMEM; diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 143fdd8aae49..7bd87d0547d8 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -718,8 +718,7 @@ static int mlxsw_sp_lpm_init(struct mlxsw_sp *mlxsw_sp) max_trees = MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_LPM_TREES); mlxsw_sp->router->lpm.tree_count = max_trees - MLXSW_SP_LPM_TREE_MIN; mlxsw_sp->router->lpm.trees = kzalloc_objs(struct mlxsw_sp_lpm_tree, - mlxsw_sp->router->lpm.tree_count, - GFP_KERNEL); + mlxsw_sp->router->lpm.tree_count); if (!mlxsw_sp->router->lpm.trees) return -ENOMEM; diff --git a/drivers/net/ethernet/netronome/nfp/bpf/verifier.c b/drivers/net/ethernet/netronome/nfp/bpf/verifier.c index de9508282841..bc594860e2b5 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/verifier.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/verifier.c @@ -771,7 +771,7 @@ int nfp_bpf_finalize(struct bpf_verifier_env *env) nfp_prog = env->prog->aux->offload->dev_priv; nfp_prog->subprog_cnt = env->subprog_cnt; nfp_prog->subprog = kzalloc_objs(nfp_prog->subprog[0], - nfp_prog->subprog_cnt, GFP_KERNEL); + nfp_prog->subprog_cnt); if (!nfp_prog->subprog) return -ENOMEM; diff --git a/drivers/net/ethernet/netronome/nfp/flower/metadata.c b/drivers/net/ethernet/netronome/nfp/flower/metadata.c index ca9e5dab2ec7..cc9a5aea6df0 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/metadata.c +++ b/drivers/net/ethernet/netronome/nfp/flower/metadata.c @@ -558,7 +558,7 @@ int nfp_flower_metadata_init(struct nfp_app *app, u64 host_ctx_count, /* Init timestamps for mask id*/ priv->mask_ids.last_used = kmalloc_objs(*priv->mask_ids.last_used, - NFP_FLOWER_MASK_ENTRY_RS, GFP_KERNEL); + NFP_FLOWER_MASK_ENTRY_RS); if (!priv->mask_ids.last_used) goto err_free_mask_id; diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index 33ea3a2edeae..42c6dcfb1f0f 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c @@ -2109,26 +2109,22 @@ static int qed_alloc_qm_data(struct qed_hwfn *p_hwfn) goto alloc_err; qm_info->qm_pq_params = kzalloc_objs(*qm_info->qm_pq_params, - qed_init_qm_get_num_pqs(p_hwfn), - GFP_KERNEL); + qed_init_qm_get_num_pqs(p_hwfn)); if (!qm_info->qm_pq_params) goto alloc_err; qm_info->qm_vport_params = kzalloc_objs(*qm_info->qm_vport_params, - qed_init_qm_get_num_vports(p_hwfn), - GFP_KERNEL); + qed_init_qm_get_num_vports(p_hwfn)); if (!qm_info->qm_vport_params) goto alloc_err; qm_info->qm_port_params = kzalloc_objs(*qm_info->qm_port_params, - p_hwfn->cdev->num_ports_in_engine, - GFP_KERNEL); + p_hwfn->cdev->num_ports_in_engine); if (!qm_info->qm_port_params) goto alloc_err; qm_info->wfq_data = kzalloc_objs(*qm_info->wfq_data, - qed_init_qm_get_num_vports(p_hwfn), - GFP_KERNEL); + qed_init_qm_get_num_vports(p_hwfn)); if (!qm_info->wfq_data) goto alloc_err; diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c index 0101b4a7c56c..4d1ce9b1a3f2 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c @@ -2760,8 +2760,7 @@ qed_iwarp_ll2_start(struct qed_hwfn *p_hwfn, goto err; iwarp_info->partial_fpdus = kzalloc_objs(*iwarp_info->partial_fpdus, - (u16)p_hwfn->p_rdma_info->num_qps, - GFP_KERNEL); + (u16)p_hwfn->p_rdma_info->num_qps); if (!iwarp_info->partial_fpdus) { rc = -ENOMEM; goto err; @@ -2781,7 +2780,7 @@ qed_iwarp_ll2_start(struct qed_hwfn *p_hwfn, * we allocate enough to take care of all rx packets */ iwarp_info->mpa_bufs = kzalloc_objs(*iwarp_info->mpa_bufs, - data.input.rx_num_desc, GFP_KERNEL); + data.input.rx_num_desc); if (!iwarp_info->mpa_bufs) { rc = -ENOMEM; goto err; diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethernet/qlogic/qed/qed_ll2.c index 572feb68d1d2..52f50c7228ed 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c +++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c @@ -2200,8 +2200,7 @@ int qed_ll2_alloc(struct qed_hwfn *p_hwfn) /* Allocate LL2's set struct */ p_ll2_connections = kzalloc_objs(struct qed_ll2_info, - QED_MAX_NUM_OF_LL2_CONNECTIONS, - GFP_KERNEL); + QED_MAX_NUM_OF_LL2_CONNECTIONS); if (!p_ll2_connections) { DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_ll2'\n"); return -ENOMEM; diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c index 9a461ab73bf2..7e37fe631a58 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c @@ -3366,7 +3366,7 @@ int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn) } nvm_info.image_att = kmalloc_objs(struct bist_nvm_image_att, - nvm_info.num_images, GFP_KERNEL); + nvm_info.num_images); if (!nvm_info.image_att) { rc = -ENOMEM; goto err0; diff --git a/drivers/net/ethernet/qlogic/qed/qed_ooo.c b/drivers/net/ethernet/qlogic/qed/qed_ooo.c index 610afab93b3f..b29bbfb7748e 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_ooo.c +++ b/drivers/net/ethernet/qlogic/qed/qed_ooo.c @@ -119,7 +119,7 @@ int qed_ooo_alloc(struct qed_hwfn *p_hwfn) INIT_LIST_HEAD(&p_ooo_info->free_isles_list); p_ooo_info->p_isles_mem = kzalloc_objs(struct qed_ooo_isle, - max_num_isles, GFP_KERNEL); + max_num_isles); if (!p_ooo_info->p_isles_mem) goto no_isles_mem; @@ -131,7 +131,7 @@ int qed_ooo_alloc(struct qed_hwfn *p_hwfn) p_ooo_info->p_archipelagos_mem = kzalloc_objs(struct qed_ooo_archipelago, - max_num_archipelagos, GFP_KERNEL); + max_num_archipelagos); if (!p_ooo_info->p_archipelagos_mem) goto no_archipelagos_mem; @@ -140,8 +140,7 @@ int qed_ooo_alloc(struct qed_hwfn *p_hwfn) p_ooo_info->ooo_history.p_cqes = kzalloc_objs(struct ooo_opaque, - QED_MAX_NUM_OOO_HISTORY_ENTRIES, - GFP_KERNEL); + QED_MAX_NUM_OOO_HISTORY_ENTRIES); if (!p_ooo_info->ooo_history.p_cqes) goto no_history_mem; diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index e71eed756091..39842eb73bc3 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c @@ -971,8 +971,7 @@ static int qede_alloc_fp_array(struct qede_dev *edev) if (!edev->coal_entry) { edev->coal_entry = kzalloc_objs(*edev->coal_entry, - QEDE_MAX_RSS_CNT(edev), - GFP_KERNEL); + QEDE_MAX_RSS_CNT(edev)); if (!edev->coal_entry) { DP_ERR(edev, "coalesce entry allocation failed\n"); goto err; diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index b75b4708c300..861a13ad7e1a 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c @@ -2579,7 +2579,7 @@ static int ql_alloc_buffer_queues(struct ql3_adapter *qdev) qdev->lrg_buf_q_alloc_size = qdev->lrg_buf_q_size * 2; qdev->lrg_buf = kmalloc_objs(struct ql_rcv_buf_cb, - qdev->num_large_buffers, GFP_KERNEL); + qdev->num_large_buffers); if (qdev->lrg_buf == NULL) return -ENOMEM; diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index 86e9cb04cae8..9192c5ad5a16 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c @@ -190,7 +190,7 @@ int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter) recv_ctx = adapter->recv_ctx; rds_ring = kzalloc_objs(struct qlcnic_host_rds_ring, - adapter->max_rds_rings, GFP_KERNEL); + adapter->max_rds_rings); if (rds_ring == NULL) goto err_out; diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 688cb578e865..ff4f7cd20c79 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -680,7 +680,7 @@ int qlcnic_setup_tss_rss_intr(struct qlcnic_adapter *adapter) if (!adapter->msix_entries) { adapter->msix_entries = kzalloc_objs(struct msix_entry, - num_msix, GFP_KERNEL); + num_msix); if (!adapter->msix_entries) return -ENOMEM; } @@ -734,7 +734,7 @@ int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix) if (!adapter->msix_entries) { adapter->msix_entries = kzalloc_objs(struct msix_entry, - num_msix, GFP_KERNEL); + num_msix); if (!adapter->msix_entries) return -ENOMEM; } @@ -1001,7 +1001,7 @@ int qlcnic_init_pci_info(struct qlcnic_adapter *adapter) } adapter->eswitch = kzalloc_objs(struct qlcnic_eswitch, - QLCNIC_NIU_MAX_XG_PORTS, GFP_KERNEL); + QLCNIC_NIU_MAX_XG_PORTS); if (!adapter->eswitch) { ret = -ENOMEM; goto err_npars; @@ -2351,7 +2351,7 @@ int qlcnic_alloc_tx_rings(struct qlcnic_adapter *adapter, struct qlcnic_cmd_buffer *cmd_buf_arr; tx_ring = kzalloc_objs(struct qlcnic_host_tx_ring, - adapter->drv_tx_rings, GFP_KERNEL); + adapter->drv_tx_rings); if (tx_ring == NULL) return -ENOMEM; diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index fb689bd4374c..84b657fc2e15 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -437,7 +437,7 @@ static int ravb_ring_init(struct net_device *ndev, int q) /* Allocate RX buffers */ priv->rx_buffers[q] = kzalloc_objs(*priv->rx_buffers[q], - priv->num_rx_ring[q], GFP_KERNEL); + priv->num_rx_ring[q]); if (!priv->rx_buffers[q]) goto error; diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c index c3766594d12e..f4dc3f3f4416 100644 --- a/drivers/net/ethernet/sfc/efx_channels.c +++ b/drivers/net/ethernet/sfc/efx_channels.c @@ -935,8 +935,7 @@ int efx_set_channels(struct efx_nic *efx) /* Allocate array for XDP TX queue lookup. */ efx->xdp_tx_queues = kzalloc_objs(*efx->xdp_tx_queues, - efx->xdp_tx_queue_count, - GFP_KERNEL); + efx->xdp_tx_queue_count); if (!efx->xdp_tx_queues) return -ENOMEM; } diff --git a/drivers/net/ethernet/sfc/efx_common.c b/drivers/net/ethernet/sfc/efx_common.c index a41a840b3710..3afaec36642f 100644 --- a/drivers/net/ethernet/sfc/efx_common.c +++ b/drivers/net/ethernet/sfc/efx_common.c @@ -997,7 +997,7 @@ int efx_init_struct(struct efx_nic *efx, struct pci_dev *pci_dev) spin_lock_init(&efx->rps_hash_lock); /* Failure to allocate is not fatal, but may degrade ARFS performance */ efx->rps_hash_table = kzalloc_objs(*efx->rps_hash_table, - EFX_ARFS_HASH_TABLE_SIZE, GFP_KERNEL); + EFX_ARFS_HASH_TABLE_SIZE); #endif spin_lock_init(&efx->vf_reps_lock); INIT_LIST_HEAD(&efx->vf_reps); diff --git a/drivers/net/ethernet/sfc/falcon/tx.c b/drivers/net/ethernet/sfc/falcon/tx.c index c514d2c65672..9e18aaf44bad 100644 --- a/drivers/net/ethernet/sfc/falcon/tx.c +++ b/drivers/net/ethernet/sfc/falcon/tx.c @@ -549,8 +549,7 @@ int ef4_probe_tx_queue(struct ef4_tx_queue *tx_queue) return -ENOMEM; tx_queue->cb_page = kzalloc_objs(tx_queue->cb_page[0], - ef4_tx_cb_page_count(tx_queue), - GFP_KERNEL); + ef4_tx_cb_page_count(tx_queue)); if (!tx_queue->cb_page) { rc = -ENOMEM; goto fail1; diff --git a/drivers/net/ethernet/sfc/mae.c b/drivers/net/ethernet/sfc/mae.c index 33278d0580aa..7a8606efd492 100644 --- a/drivers/net/ethernet/sfc/mae.c +++ b/drivers/net/ethernet/sfc/mae.c @@ -256,11 +256,11 @@ more: goto fail; rc = -ENOMEM; desc->keys = kzalloc_objs(struct efx_tc_table_field_fmt, - desc->n_keys, GFP_KERNEL); + desc->n_keys); if (!desc->keys) goto fail; desc->resps = kzalloc_objs(struct efx_tc_table_field_fmt, - desc->n_resps, GFP_KERNEL); + desc->n_resps); if (!desc->resps) goto fail; } diff --git a/drivers/net/ethernet/sfc/siena/efx_channels.c b/drivers/net/ethernet/sfc/siena/efx_channels.c index 1ddab2e2263e..1fc343598771 100644 --- a/drivers/net/ethernet/sfc/siena/efx_channels.c +++ b/drivers/net/ethernet/sfc/siena/efx_channels.c @@ -967,8 +967,7 @@ int efx_siena_set_channels(struct efx_nic *efx) /* Allocate array for XDP TX queue lookup. */ efx->xdp_tx_queues = kzalloc_objs(*efx->xdp_tx_queues, - efx->xdp_tx_queue_count, - GFP_KERNEL); + efx->xdp_tx_queue_count); if (!efx->xdp_tx_queues) return -ENOMEM; } diff --git a/drivers/net/ethernet/sfc/siena/efx_common.c b/drivers/net/ethernet/sfc/siena/efx_common.c index 07e650f2d13e..f91e5f8c0b35 100644 --- a/drivers/net/ethernet/sfc/siena/efx_common.c +++ b/drivers/net/ethernet/sfc/siena/efx_common.c @@ -1024,7 +1024,7 @@ int efx_siena_init_struct(struct efx_nic *efx, spin_lock_init(&efx->rps_hash_lock); /* Failure to allocate is not fatal, but may degrade ARFS performance */ efx->rps_hash_table = kzalloc_objs(*efx->rps_hash_table, - EFX_ARFS_HASH_TABLE_SIZE, GFP_KERNEL); + EFX_ARFS_HASH_TABLE_SIZE); #endif efx->mdio.dev = net_dev; INIT_WORK(&efx->mac_work, efx_mac_work); diff --git a/drivers/net/ethernet/sfc/siena/tx_common.c b/drivers/net/ethernet/sfc/siena/tx_common.c index 6a92543a1c5e..bcdf8c561579 100644 --- a/drivers/net/ethernet/sfc/siena/tx_common.c +++ b/drivers/net/ethernet/sfc/siena/tx_common.c @@ -41,8 +41,7 @@ int efx_siena_probe_tx_queue(struct efx_tx_queue *tx_queue) return -ENOMEM; tx_queue->cb_page = kzalloc_objs(tx_queue->cb_page[0], - efx_tx_cb_page_count(tx_queue), - GFP_KERNEL); + efx_tx_cb_page_count(tx_queue)); if (!tx_queue->cb_page) { rc = -ENOMEM; goto fail1; diff --git a/drivers/net/ethernet/sfc/tx_common.c b/drivers/net/ethernet/sfc/tx_common.c index f5bdfa0c31a3..71c96499f602 100644 --- a/drivers/net/ethernet/sfc/tx_common.c +++ b/drivers/net/ethernet/sfc/tx_common.c @@ -41,8 +41,7 @@ int efx_probe_tx_queue(struct efx_tx_queue *tx_queue) return -ENOMEM; tx_queue->cb_page = kzalloc_objs(tx_queue->cb_page[0], - efx_tx_cb_page_count(tx_queue), - GFP_KERNEL); + efx_tx_cb_page_count(tx_queue)); if (!tx_queue->cb_page) { rc = -ENOMEM; goto fail1; diff --git a/drivers/net/ethernet/spacemit/k1_emac.c b/drivers/net/ethernet/spacemit/k1_emac.c index 870ab19395d6..338a2637b1da 100644 --- a/drivers/net/ethernet/spacemit/k1_emac.c +++ b/drivers/net/ethernet/spacemit/k1_emac.c @@ -392,7 +392,7 @@ static int emac_alloc_tx_resources(struct emac_priv *priv) struct platform_device *pdev = priv->pdev; tx_ring->tx_desc_buf = kzalloc_objs(*tx_ring->tx_desc_buf, - tx_ring->total_cnt, GFP_KERNEL); + tx_ring->total_cnt); if (!tx_ring->tx_desc_buf) return -ENOMEM; @@ -420,7 +420,7 @@ static int emac_alloc_rx_resources(struct emac_priv *priv) struct platform_device *pdev = priv->pdev; rx_ring->rx_desc_buf = kzalloc_objs(*rx_ring->rx_desc_buf, - rx_ring->total_cnt, GFP_KERNEL); + rx_ring->total_cnt); if (!rx_ring->rx_desc_buf) return -ENOMEM; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 3b3532cc12d7..edf0799b7236 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2296,7 +2296,7 @@ static int __alloc_dma_tx_desc_resources(struct stmmac_priv *priv, tx_q->priv_data = priv; tx_q->tx_skbuff_dma = kzalloc_objs(*tx_q->tx_skbuff_dma, - dma_conf->dma_tx_size, GFP_KERNEL); + dma_conf->dma_tx_size); if (!tx_q->tx_skbuff_dma) return -ENOMEM; diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c index aa7c90d191f4..2a40257ab47c 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c @@ -141,7 +141,7 @@ static int xlgmac_init_ring(struct xlgmac_pdata *pdata, /* Array of descriptor data */ ring->desc_data_head = kzalloc_objs(struct xlgmac_desc_data, - dma_desc_count, GFP_KERNEL); + dma_desc_count); if (!ring->desc_data_head) return -ENOMEM; diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c index f20e06985c5e..88669aa53f65 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c @@ -2306,7 +2306,7 @@ static struct net_device *gelic_wl_alloc(struct gelic_card *card) /* allocate scan list */ wl->networks = kzalloc_objs(struct gelic_wl_scan_info, - GELIC_WL_BSS_MAX_ENT, GFP_KERNEL); + GELIC_WL_BSS_MAX_ENT); if (!wl->networks) goto fail_bss; diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c index b71784bacf73..6d7b6f3b4633 100644 --- a/drivers/net/ethernet/via/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c @@ -1632,7 +1632,7 @@ static int velocity_init_rd_ring(struct velocity_info *vptr) int ret = -ENOMEM; vptr->rx.info = kzalloc_objs(struct velocity_rd_info, - vptr->options.numrx, GFP_KERNEL); + vptr->options.numrx); if (!vptr->rx.info) goto out; @@ -1665,8 +1665,7 @@ static int velocity_init_td_ring(struct velocity_info *vptr) for (j = 0; j < vptr->tx.numq; j++) { vptr->tx.infos[j] = kzalloc_objs(struct velocity_td_info, - vptr->options.numtx, - GFP_KERNEL); + vptr->options.numtx); if (!vptr->tx.infos[j]) { while (--j >= 0) kfree(vptr->tx.infos[j]); diff --git a/drivers/net/ethernet/wangxun/libwx/wx_hw.c b/drivers/net/ethernet/wangxun/libwx/wx_hw.c index c78e0775aeb5..bee9e245e792 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_hw.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_hw.c @@ -2506,7 +2506,7 @@ int wx_sw_init(struct wx *wx) WX_RSS_FIELD_IPV6 | WX_RSS_FIELD_IPV6_TCP; wx->mac_table = kzalloc_objs(struct wx_mac_addr, - wx->mac.num_rar_entries, GFP_KERNEL); + wx->mac.num_rar_entries); if (!wx->mac_table) { wx_err(wx, "mac_table allocation failed\n"); kfree(wx->rss_key); diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c index bc13df81bfa3..e82de0fd3157 100644 --- a/drivers/net/netdevsim/dev.c +++ b/drivers/net/netdevsim/dev.c @@ -940,8 +940,7 @@ static int nsim_dev_traps_init(struct devlink *devlink) return -ENOMEM; nsim_trap_data->trap_items_arr = kzalloc_objs(struct nsim_trap_item, - ARRAY_SIZE(nsim_traps_arr), - GFP_KERNEL); + ARRAY_SIZE(nsim_traps_arr)); if (!nsim_trap_data->trap_items_arr) { err = -ENOMEM; goto err_trap_data_free; diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index be0051ff6420..98472abdd392 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -1032,7 +1032,7 @@ static struct dp83640_clock *dp83640_clock_get_bus(struct mii_bus *bus) goto out; clock->caps.pin_config = kzalloc_objs(struct ptp_pin_desc, - DP83640_N_PINS, GFP_KERNEL); + DP83640_N_PINS); if (!clock->caps.pin_config) { kfree(clock); clock = NULL; diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c index 9e24d4ebcb79..4eb7716bb9d6 100644 --- a/drivers/net/phy/phy_led_triggers.c +++ b/drivers/net/phy/phy_led_triggers.c @@ -104,8 +104,7 @@ int phy_led_triggers_register(struct phy_device *phy) goto out_free_link; phy->phy_led_triggers = kzalloc_objs(struct phy_led_trigger, - phy->phy_num_led_triggers, - GFP_KERNEL); + phy->phy_num_led_triggers); if (!phy->phy_led_triggers) { err = -ENOMEM; goto out_unreg_link; diff --git a/drivers/net/pse-pd/pd692x0.c b/drivers/net/pse-pd/pd692x0.c index e923da5c5506..4a3c852780f5 100644 --- a/drivers/net/pse-pd/pd692x0.c +++ b/drivers/net/pse-pd/pd692x0.c @@ -647,8 +647,7 @@ pd692x0_pi_get_pw_limit_ranges(struct pse_controller_dev *pcdev, int id, pw_table = pd692x0_class_pw_table; c33_pw_limit_ranges = kzalloc_objs(*c33_pw_limit_ranges, - PD692X0_CLASS_PW_TABLE_SIZE, - GFP_KERNEL); + PD692X0_CLASS_PW_TABLE_SIZE); if (!c33_pw_limit_ranges) return -ENOMEM; diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c index 7ec8be82c1c9..0c1138407838 100644 --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c @@ -1216,8 +1216,7 @@ static int ath11k_debugfs_dbr_dbg_init(struct ath11k *ar, int dbr_id) dbr_dbg_data->num_ring_debug_entries = ATH11K_DEBUG_DBR_ENTRIES_MAX; dbr_dbg_data->dbr_debug_idx = 0; dbr_dbg_data->entries = kzalloc_objs(struct ath11k_dbg_dbr_entry, - ATH11K_DEBUG_DBR_ENTRIES_MAX, - GFP_KERNEL); + ATH11K_DEBUG_DBR_ENTRIES_MAX); if (!dbr_dbg_data->entries) return -ENOMEM; diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c index 715e561bf8ca..1c82d927d27b 100644 --- a/drivers/net/wireless/ath/ath12k/dp.c +++ b/drivers/net/wireless/ath/ath12k/dp.c @@ -408,7 +408,7 @@ static int ath12k_dp_init_bank_profiles(struct ath12k_base *ab) dp->num_bank_profiles = num_tcl_banks; dp->bank_profiles = kmalloc_objs(struct ath12k_dp_tx_bank_profile, - num_tcl_banks, GFP_KERNEL); + num_tcl_banks); if (!dp->bank_profiles) return -ENOMEM; diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 7b945a010ea1..05c9c07591fc 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -920,7 +920,7 @@ ath5k_desc_alloc(struct ath5k_hw *ah) ds, ah->desc_len, (unsigned long long)ah->desc_daddr); bf = kzalloc_objs(struct ath5k_buf, - 1 + ATH_TXBUF + ATH_RXBUF + ATH_BCBUF, GFP_KERNEL); + 1 + ATH_TXBUF + ATH_RXBUF + ATH_BCBUF); if (bf == NULL) { ATH5K_ERR(ah, "can't allocate bufptr\n"); ret = -ENOMEM; diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c index 9e4983d31628..e163706f8728 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.c +++ b/drivers/net/wireless/ath/ath5k/eeprom.c @@ -728,7 +728,7 @@ ath5k_eeprom_convert_pcal_info_5111(struct ath5k_hw *ah, int mode, /* Allocate pd_curves for this cal pier */ chinfo[pier].pd_curves = kzalloc_objs(struct ath5k_pdgain_info, - AR5K_EEPROM_N_PD_CURVES, GFP_KERNEL); + AR5K_EEPROM_N_PD_CURVES); if (!chinfo[pier].pd_curves) goto err_out; @@ -916,8 +916,7 @@ ath5k_eeprom_convert_pcal_info_5112(struct ath5k_hw *ah, int mode, /* Allocate pd_curves for this cal pier */ chinfo[pier].pd_curves = kzalloc_objs(struct ath5k_pdgain_info, - AR5K_EEPROM_N_PD_CURVES, - GFP_KERNEL); + AR5K_EEPROM_N_PD_CURVES); if (!chinfo[pier].pd_curves) goto err_out; @@ -1206,8 +1205,7 @@ ath5k_eeprom_convert_pcal_info_2413(struct ath5k_hw *ah, int mode, /* Allocate pd_curves for this cal pier */ chinfo[pier].pd_curves = kzalloc_objs(struct ath5k_pdgain_info, - AR5K_EEPROM_N_PD_CURVES, - GFP_KERNEL); + AR5K_EEPROM_N_PD_CURVES); if (!chinfo[pier].pd_curves) goto err_out; diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c index 1e796087435d..b8cb736a7185 100644 --- a/drivers/net/wireless/ath/wil6210/debugfs.c +++ b/drivers/net/wireless/ath/wil6210/debugfs.c @@ -2442,7 +2442,7 @@ int wil6210_debugfs_init(struct wil6210_priv *wil) return -ENODEV; wil->dbg_data.data_arr = kzalloc_objs(struct wil_debugfs_iomem_data, - dbg_off_count, GFP_KERNEL); + dbg_off_count); if (!wil->dbg_data.data_arr) { debugfs_remove_recursive(dbg); wil->debug = NULL; diff --git a/drivers/net/wireless/broadcom/b43legacy/debugfs.c b/drivers/net/wireless/broadcom/b43legacy/debugfs.c index 22811359d89d..3ad99124d522 100644 --- a/drivers/net/wireless/broadcom/b43legacy/debugfs.c +++ b/drivers/net/wireless/broadcom/b43legacy/debugfs.c @@ -366,7 +366,7 @@ void b43legacy_debugfs_add_device(struct b43legacy_wldev *dev) e->dev = dev; log = &e->txstatlog; log->log = kzalloc_objs(struct b43legacy_txstatus, - B43legacy_NR_LOGGED_TXSTATUS, GFP_KERNEL); + B43legacy_NR_LOGGED_TXSTATUS); if (!log->log) { b43legacyerr(dev->wl, "debugfs: add device txstatus OOM\n"); kfree(e); diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c index aba1168ab728..6b3e0b2bbca7 100644 --- a/drivers/net/wireless/broadcom/b43legacy/main.c +++ b/drivers/net/wireless/broadcom/b43legacy/main.c @@ -3270,7 +3270,7 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev) if ((phy->type == B43legacy_PHYTYPE_B) || (phy->type == B43legacy_PHYTYPE_G)) { phy->_lo_pairs = kzalloc_objs(struct b43legacy_lopair, - B43legacy_LO_COUNT, GFP_KERNEL); + B43legacy_LO_COUNT); if (!phy->_lo_pairs) return -ENOMEM; } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c index a88abe390aee..ba1ce1552e0f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c @@ -1589,7 +1589,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr) msgbuf->max_flowrings = if_msgbuf->max_flowrings; msgbuf->flowring_dma_handle = kzalloc_objs(*msgbuf->flowring_dma_handle, - msgbuf->max_flowrings, GFP_KERNEL); + msgbuf->max_flowrings); if (!msgbuf->flowring_dma_handle) goto fail; diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c index 8837f44fd06b..248a051da52d 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c @@ -1886,7 +1886,7 @@ static int ipw2100_wdev_init(struct net_device *dev) bg_band->band = NL80211_BAND_2GHZ; bg_band->n_channels = geo->bg_channels; bg_band->channels = kzalloc_objs(struct ieee80211_channel, - geo->bg_channels, GFP_KERNEL); + geo->bg_channels); if (!bg_band->channels) { ipw2100_down(priv); return -ENOMEM; @@ -4408,7 +4408,7 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv) } priv->tx_buffers = kmalloc_objs(struct ipw2100_tx_packet, - TX_PENDED_QUEUE_LENGTH, GFP_KERNEL); + TX_PENDED_QUEUE_LENGTH); if (!priv->tx_buffers) { bd_queue_free(priv, &priv->tx_queue); return -ENOMEM; @@ -4552,7 +4552,7 @@ static int ipw2100_rx_allocate(struct ipw2100_priv *priv) * allocate packets */ priv->rx_buffers = kmalloc_objs(struct ipw2100_rx_packet, - RX_QUEUE_LENGTH, GFP_KERNEL); + RX_QUEUE_LENGTH); if (!priv->rx_buffers) { IPW_DEBUG_INFO("can't allocate rx packet buffer table\n"); diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c index e045208e2531..dd64d21174e3 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c @@ -11278,7 +11278,7 @@ static int ipw_wdev_init(struct net_device *dev) bg_band->band = NL80211_BAND_2GHZ; bg_band->n_channels = geo->bg_channels; bg_band->channels = kzalloc_objs(struct ieee80211_channel, - geo->bg_channels, GFP_KERNEL); + geo->bg_channels); if (!bg_band->channels) { rc = -ENOMEM; goto out; @@ -11316,7 +11316,7 @@ static int ipw_wdev_init(struct net_device *dev) a_band->band = NL80211_BAND_5GHZ; a_band->n_channels = geo->a_channels; a_band->channels = kzalloc_objs(struct ieee80211_channel, - geo->a_channels, GFP_KERNEL); + geo->a_channels); if (!a_band->channels) { rc = -ENOMEM; goto out; diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tt.c b/drivers/net/wireless/intel/iwlwifi/dvm/tt.c index 9bfdf033463b..fc9cf0531024 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/tt.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/tt.c @@ -596,10 +596,9 @@ void iwl_tt_initialize(struct iwl_priv *priv) if (priv->lib->adv_thermal_throttle) { IWL_DEBUG_TEMP(priv, "Advanced Thermal Throttling\n"); tt->restriction = kzalloc_objs(struct iwl_tt_restriction, - IWL_TI_STATE_MAX, GFP_KERNEL); + IWL_TI_STATE_MAX); tt->transaction = kzalloc_objs(struct iwl_tt_trans, - IWL_TI_STATE_MAX * (IWL_TI_STATE_MAX - 1), - GFP_KERNEL); + IWL_TI_STATE_MAX * (IWL_TI_STATE_MAX - 1)); if (!tt->restriction || !tt->transaction) { IWL_ERR(priv, "Fallback to Legacy Throttling\n"); priv->thermal_throttle.advanced_tt = false; diff --git a/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c b/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c index fb63c8ba800a..d39dd36b08e3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c @@ -132,7 +132,7 @@ int iwl_mld_low_latency_init(struct iwl_mld *mld) unsigned long ts = jiffies; ll->pkts_counters = kzalloc_objs(*ll->pkts_counters, - mld->trans->info.num_rxqs, GFP_KERNEL); + mld->trans->info.num_rxqs); if (!ll->pkts_counters) return -ENOMEM; diff --git a/drivers/net/wireless/intel/iwlwifi/mld/scan.c b/drivers/net/wireless/intel/iwlwifi/mld/scan.c index 6679be028a6b..a1a4cf3ab3d3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/scan.c @@ -2084,8 +2084,7 @@ void iwl_mld_handle_channel_survey_notif(struct iwl_mld *mld, } mld->channel_survey = kzalloc_flex(*mld->channel_survey, - channels, n_channels, - GFP_KERNEL); + channels, n_channels); if (!mld->channel_survey) return; diff --git a/drivers/net/wireless/intel/iwlwifi/mld/sta.c b/drivers/net/wireless/intel/iwlwifi/mld/sta.c index 3b8ff0744e7c..6b7a89e050e6 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/sta.c @@ -695,8 +695,7 @@ static void iwl_mld_alloc_mpdu_counters(struct iwl_mld *mld, return; mld_sta->mpdu_counters = kzalloc_objs(*mld_sta->mpdu_counters, - mld->trans->info.num_rxqs, - GFP_KERNEL); + mld->trans->info.num_rxqs); if (!mld_sta->mpdu_counters) return; diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index aeaa1d4b312d..090791fe0638 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -4349,8 +4349,7 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw, WARN_ON(rcu_access_pointer(mvmsta->ptk_pn[keyidx])); ptk_pn = kzalloc_flex(*ptk_pn, q, - mvm->trans->info.num_rxqs, - GFP_KERNEL); + mvm->trans->info.num_rxqs); if (!ptk_pn) { ret = -ENOMEM; break; diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 966558885ea6..79829f775c89 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -3604,7 +3604,7 @@ void iwl_mvm_rx_channel_survey_notif(struct iwl_mvm *mvm, } mvm->acs_survey = kzalloc_flex(*mvm->acs_survey, channels, - n_channels, GFP_KERNEL); + n_channels); if (!mvm->acs_survey) return; diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c index 7c662d5f2b72..fe263cdc2e4f 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c @@ -775,11 +775,10 @@ static int iwl_pcie_rx_alloc(struct iwl_trans *trans) trans_pcie->rxq = kzalloc_objs(struct iwl_rxq, trans->info.num_rxqs); trans_pcie->rx_pool = kzalloc_objs(trans_pcie->rx_pool[0], - RX_POOL_SIZE(trans_pcie->num_rx_bufs), - GFP_KERNEL); + RX_POOL_SIZE(trans_pcie->num_rx_bufs)); trans_pcie->global_table = kzalloc_objs(trans_pcie->global_table[0], - RX_POOL_SIZE(trans_pcie->num_rx_bufs), GFP_KERNEL); + RX_POOL_SIZE(trans_pcie->num_rx_bufs)); if (!trans_pcie->rxq || !trans_pcie->rx_pool || !trans_pcie->global_table) { ret = -ENOMEM; diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c index d7979d75b073..fdb3ba4f63c0 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c @@ -836,7 +836,7 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans) trans_pcie->txq_memory = kzalloc_objs(struct iwl_txq, - trans->mac_cfg->base->num_of_queues, GFP_KERNEL); + trans->mac_cfg->base->num_of_queues); if (!trans_pcie->txq_memory) { IWL_ERR(trans, "Not enough memory for txq\n"); ret = -ENOMEM; diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c index 148c110c5a2b..95580921d933 100644 --- a/drivers/net/wireless/intersil/p54/eeprom.c +++ b/drivers/net/wireless/intersil/p54/eeprom.c @@ -159,7 +159,7 @@ static int p54_generate_band(struct ieee80211_hw *dev, goto err_out; tmp->channels = kzalloc_objs(struct ieee80211_channel, - list->band_channel_num[band], GFP_KERNEL); + list->band_channel_num[band]); if (!tmp->channels) goto err_out; diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index 63d9ccc5a81c..43704106cd80 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -4678,8 +4678,7 @@ int mwifiex_init_channel_scan_gap(struct mwifiex_adapter *adapter) */ adapter->num_in_chan_stats = 2 * (n_channels_bg + n_channels_a); adapter->chan_stats = kzalloc_objs(*adapter->chan_stats, - adapter->num_in_chan_stats, - GFP_KERNEL); + adapter->num_in_chan_stats); if (!adapter->chan_stats) return -ENOMEM; diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c index 1bb30fbab12b..29e0f274575e 100644 --- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c +++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c @@ -390,7 +390,7 @@ int mwifiex_alloc_cmd_buffer(struct mwifiex_adapter *adapter) /* Allocate and initialize struct cmd_ctrl_node */ cmd_array = kzalloc_objs(struct cmd_ctrl_node, - MWIFIEX_NUM_OF_CMD_BUFFER, GFP_KERNEL); + MWIFIEX_NUM_OF_CMD_BUFFER); if (!cmd_array) return -ENOMEM; diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c index 4e511f8700a8..97c0ec3b822e 100644 --- a/drivers/net/wireless/marvell/mwifiex/scan.c +++ b/drivers/net/wireless/marvell/mwifiex/scan.c @@ -1510,7 +1510,7 @@ int mwifiex_scan_networks(struct mwifiex_private *priv, } scan_chan_list = kzalloc_objs(struct mwifiex_chan_scan_param_set, - MWIFIEX_USER_SCAN_CHAN_MAX, GFP_KERNEL); + MWIFIEX_USER_SCAN_CHAN_MAX); if (!scan_chan_list) { kfree(scan_cfg_out); ret = -ENOMEM; diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index 1b3fcc2b3355..d9c4dd6beaec 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -1253,7 +1253,7 @@ qtnf_cmd_resp_proc_mac_info(struct qtnf_wmac *mac, mac_info->n_if_comb = resp_info->n_iface_combinations; mac_info->if_comb = kzalloc_objs(*mac->macinfo.if_comb, - mac->macinfo.n_if_comb, GFP_KERNEL); + mac->macinfo.n_if_comb); if (!mac->macinfo.if_comb) return -ENOMEM; |