summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-02-21 17:06:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2026-02-21 17:09:51 -0800
commit323bbfcf1ef8836d0d2ad9e2c1f1c684f0e3b5b3 (patch)
tree515dca34daa8d18ec26c2c3da3096c6c23955c95 /drivers/net
parentbf4afc53b77aeaa48b5409da5c8da6bb4eff7f43 (diff)
downloadlwn-323bbfcf1ef8836d0d2ad9e2c1f1c684f0e3b5b3.tar.gz
lwn-323bbfcf1ef8836d0d2ad9e2c1f1c684f0e3b5b3.zip
Convert 'alloc_flex' family to use the new default GFP_KERNEL argument
This is the exact same thing as the 'alloc_obj()' version, only much smaller because there are a lot fewer users of the *alloc_flex() interface. As with alloc_obj() version, this was done entirely with mindless brute force, using the same script, except using 'flex' in the pattern rather than 'objs*'. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bonding/bond_main.c2
-rw-r--r--drivers/net/can/usb/gs_usb.c2
-rw-r--r--drivers/net/dsa/sja1105/sja1105_tas.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb3/l2t.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/l2t.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/sched.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/smt.c2
-rw-r--r--drivers/net/ethernet/engleder/tsnep_selftests.c6
-rw-r--r--drivers/net/ethernet/freescale/enetc/enetc.c2
-rw-r--r--drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c2
-rw-r--r--drivers/net/ethernet/intel/fm10k/fm10k_main.c2
-rw-r--r--drivers/net/ethernet/intel/iavf/iavf_ptp.c2
-rw-r--r--drivers/net/ethernet/intel/idpf/idpf_ethtool.c4
-rw-r--r--drivers/net/ethernet/intel/idpf/idpf_virtchnl.c2
-rw-r--r--drivers/net/ethernet/intel/igc/igc_main.c2
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/debugfs.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/fs_core.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c4
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/core_env.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c6
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c2
-rw-r--r--drivers/net/ethernet/meta/fbnic/fbnic_txrx.c2
-rw-r--r--drivers/net/ethernet/microsoft/mana/hw_channel.c2
-rw-r--r--drivers/net/ethernet/microsoft/mana/mana_en.c2
-rw-r--r--drivers/net/ethernet/netronome/nfp/nfp_net_repr.c2
-rw-r--r--drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c2
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c6
-rw-r--r--drivers/net/ethernet/wangxun/libwx/wx_lib.c2
-rw-r--r--drivers/net/wan/wanxl.c2
-rw-r--r--drivers/net/wireless/ath/ath11k/ce.c2
-rw-r--r--drivers/net/wireless/ath/ath11k/reg.c2
-rw-r--r--drivers/net/wireless/ath/ath12k/ce.c2
-rw-r--r--drivers/net/wireless/ath/ath12k/reg.c2
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c2
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c2
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c2
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c2
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c2
-rw-r--r--drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c2
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c2
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c4
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mld/d3.c2
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mld/mac80211.c2
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/d3.c4
-rw-r--r--drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c2
-rw-r--r--drivers/net/wireless/mediatek/mt76/agg-rx.c2
-rw-r--r--drivers/net/wireless/realtek/rtw89/acpi.c2
54 files changed, 64 insertions, 64 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index c9bf8ec00a36..93b7f38f59a8 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -5099,7 +5099,7 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)
usable_slaves = kzalloc_flex(*usable_slaves, arr, bond->slave_cnt,
GFP_KERNEL);
- all_slaves = kzalloc_flex(*all_slaves, arr, bond->slave_cnt, GFP_KERNEL);
+ all_slaves = kzalloc_flex(*all_slaves, arr, bond->slave_cnt);
if (!usable_slaves || !all_slaves) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 95de036c4410..9d27d6f0c0b5 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -1560,7 +1560,7 @@ static int gs_usb_probe(struct usb_interface *intf,
return -EINVAL;
}
- parent = kzalloc_flex(*parent, canch, icount, GFP_KERNEL);
+ parent = kzalloc_flex(*parent, canch, icount);
if (!parent)
return -ENOMEM;
diff --git a/drivers/net/dsa/sja1105/sja1105_tas.c b/drivers/net/dsa/sja1105/sja1105_tas.c
index a3090c70b428..e47967b12d5d 100644
--- a/drivers/net/dsa/sja1105/sja1105_tas.c
+++ b/drivers/net/dsa/sja1105/sja1105_tas.c
@@ -477,7 +477,7 @@ bool sja1105_gating_check_conflicts(struct sja1105_private *priv, int port,
if (list_empty(&gating_cfg->entries))
return false;
- dummy = kzalloc_flex(*dummy, entries, num_entries, GFP_KERNEL);
+ dummy = kzalloc_flex(*dummy, entries, num_entries);
if (!dummy) {
NL_SET_ERR_MSG_MOD(extack, "Failed to allocate memory");
return true;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
index 818481f7a3ea..f13dfceb065c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
@@ -1654,7 +1654,7 @@ static int bnx2x_vf_mbx_macvlan_list(struct bnx2x *bp,
int i, j;
struct bnx2x_vf_mac_vlan_filters *fl = NULL;
- fl = kzalloc_flex(*fl, filters, tlv->n_mac_vlan_filters, GFP_KERNEL);
+ fl = kzalloc_flex(*fl, filters, tlv->n_mac_vlan_filters);
if (!fl)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
index 6bcb952fe832..e27c6ff67cbd 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
@@ -408,7 +408,7 @@ struct l2t_data *t3_init_l2t(unsigned int l2t_capacity)
struct l2t_data *d;
int i;
- d = kvzalloc_flex(*d, l2tab, l2t_capacity, GFP_KERNEL);
+ d = kvzalloc_flex(*d, l2tab, l2t_capacity);
if (!d)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c b/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
index 0549265807a1..6954c15d2b82 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
@@ -287,7 +287,7 @@ struct clip_tbl *t4_init_clip_tbl(unsigned int clipt_start,
if (clipt_size < CLIPT_MIN_HASH_BUCKETS)
return NULL;
- ctbl = kvzalloc_flex(*ctbl, hash_list, clipt_size, GFP_KERNEL);
+ ctbl = kvzalloc_flex(*ctbl, hash_list, clipt_size);
if (!ctbl)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c
index dbfa657c04b9..1c1a7bc5a896 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c
@@ -501,7 +501,7 @@ struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap)
if (!max_tids)
return NULL;
- t = kvzalloc_flex(*t, table, max_tids, GFP_KERNEL);
+ t = kvzalloc_flex(*t, table, max_tids);
if (!t)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
index 1e2a6bac25ba..426189d6c25a 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
@@ -620,7 +620,7 @@ struct l2t_data *t4_init_l2t(unsigned int l2t_start, unsigned int l2t_end)
if (l2t_size < L2T_MIN_HASH_BUCKETS)
return NULL;
- d = kvzalloc_flex(*d, l2tab, l2t_size, GFP_KERNEL);
+ d = kvzalloc_flex(*d, l2tab, l2t_size);
if (!d)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sched.c b/drivers/net/ethernet/chelsio/cxgb4/sched.c
index 28b1d5b2bcab..442d63bece59 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sched.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sched.c
@@ -653,7 +653,7 @@ struct sched_table *t4_init_sched(unsigned int sched_size)
struct sched_table *s;
unsigned int i;
- s = kvzalloc_flex(*s, tab, sched_size, GFP_KERNEL);
+ s = kvzalloc_flex(*s, tab, sched_size);
if (!s)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/smt.c b/drivers/net/ethernet/chelsio/cxgb4/smt.c
index 315c7605622f..21c7ec34b788 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/smt.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/smt.c
@@ -47,7 +47,7 @@ struct smt_data *t4_init_smt(void)
smt_size = SMT_SIZE;
- s = kvzalloc_flex(*s, smtab, smt_size, GFP_KERNEL);
+ s = kvzalloc_flex(*s, smtab, smt_size);
if (!s)
return NULL;
s->smt_size = smt_size;
diff --git a/drivers/net/ethernet/engleder/tsnep_selftests.c b/drivers/net/ethernet/engleder/tsnep_selftests.c
index 1a67d3136456..f153da750c43 100644
--- a/drivers/net/ethernet/engleder/tsnep_selftests.c
+++ b/drivers/net/ethernet/engleder/tsnep_selftests.c
@@ -354,7 +354,7 @@ static bool tsnep_test_taprio(struct tsnep_adapter *adapter)
struct tc_taprio_qopt_offload *qopt;
int i;
- qopt = kzalloc_flex(*qopt, entries, 255, GFP_KERNEL);
+ qopt = kzalloc_flex(*qopt, entries, 255);
if (!qopt)
return false;
for (i = 0; i < 255; i++)
@@ -451,7 +451,7 @@ static bool tsnep_test_taprio_change(struct tsnep_adapter *adapter)
struct tc_taprio_qopt_offload *qopt;
int i;
- qopt = kzalloc_flex(*qopt, entries, 255, GFP_KERNEL);
+ qopt = kzalloc_flex(*qopt, entries, 255);
if (!qopt)
return false;
for (i = 0; i < 255; i++)
@@ -604,7 +604,7 @@ static bool tsnep_test_taprio_extension(struct tsnep_adapter *adapter)
struct tc_taprio_qopt_offload *qopt;
int i;
- qopt = kzalloc_flex(*qopt, entries, 255, GFP_KERNEL);
+ qopt = kzalloc_flex(*qopt, entries, 255);
if (!qopt)
return false;
for (i = 0; i < 255; i++)
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index c220dfdbadfe..7cad3da8a243 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -3454,7 +3454,7 @@ static int enetc_int_vector_init(struct enetc_ndev_priv *priv, int i,
struct enetc_bdr *bdr;
int j, err;
- v = kzalloc_flex(*v, tx_ring, v_tx_rings, GFP_KERNEL);
+ v = kzalloc_flex(*v, tx_ring, v_tx_rings);
if (!v)
return -ENOMEM;
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
index a4f4c4d14035..47c25692b91c 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
@@ -81,7 +81,7 @@ static struct hnae_handle *hns_ae_get_handle(struct hnae_ae_dev *dev,
vfnum_per_port = hns_ae_get_vf_num_per_port(dsaf_dev, port_id);
qnum_per_vf = hns_ae_get_q_num_per_vf(dsaf_dev, port_id);
- vf_cb = kzalloc_flex(*vf_cb, ae_handle.qs, qnum_per_vf, GFP_KERNEL);
+ vf_cb = kzalloc_flex(*vf_cb, ae_handle.qs, qnum_per_vf);
if (unlikely(!vf_cb)) {
dev_err(dsaf_dev->dev, "malloc vf_cb fail!\n");
ae_handle = ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 9f2620a14484..9fee3a511e4b 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -1597,7 +1597,7 @@ static int fm10k_alloc_q_vector(struct fm10k_intfc *interface,
ring_count = txr_count + rxr_count;
/* allocate q_vector and rings */
- q_vector = kzalloc_flex(*q_vector, ring, ring_count, GFP_KERNEL);
+ q_vector = kzalloc_flex(*q_vector, ring, ring_count);
if (!q_vector)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/iavf/iavf_ptp.c b/drivers/net/ethernet/intel/iavf/iavf_ptp.c
index f2f3411878e1..87b97e09df14 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_ptp.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_ptp.c
@@ -133,7 +133,7 @@ static struct iavf_ptp_aq_cmd *iavf_allocate_ptp_cmd(enum virtchnl_ops v_opcode,
{
struct iavf_ptp_aq_cmd *cmd;
- cmd = kzalloc_flex(*cmd, msg, msglen, GFP_KERNEL);
+ cmd = kzalloc_flex(*cmd, msg, msglen);
if (!cmd)
return NULL;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c b/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
index cd211c559a59..40e08a71d2d3 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
@@ -200,7 +200,7 @@ static int idpf_add_flow_steer(struct net_device *netdev,
if (q_index >= num_rxq)
return -EINVAL;
- rule = kzalloc_flex(*rule, rule_info, 1, GFP_KERNEL);
+ rule = kzalloc_flex(*rule, rule_info, 1);
if (!rule)
return -ENOMEM;
@@ -310,7 +310,7 @@ static int idpf_del_flow_steer(struct net_device *netdev,
if (!idpf_sideband_action_ena(vport, fsp))
return -EOPNOTSUPP;
- rule = kzalloc_flex(*rule, rule_info, 1, GFP_KERNEL);
+ rule = kzalloc_flex(*rule, rule_info, 1);
if (!rule)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
index c03810c03f37..cf655af6c4f0 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
@@ -740,7 +740,7 @@ struct idpf_queue_set *idpf_alloc_queue_set(struct idpf_adapter *adapter,
{
struct idpf_queue_set *qp;
- qp = kzalloc_flex(*qp, qs, num, GFP_KERNEL);
+ qp = kzalloc_flex(*qp, qs, num);
if (!qp)
return NULL;
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 73d841e63d2d..e31072dd0863 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -4863,7 +4863,7 @@ static int igc_alloc_q_vector(struct igc_adapter *adapter,
/* allocate q_vector and rings */
q_vector = adapter->q_vector[v_idx];
if (!q_vector)
- q_vector = kzalloc_flex(*q_vector, ring, ring_count, GFP_KERNEL);
+ q_vector = kzalloc_flex(*q_vector, ring, ring_count);
else
memset(q_vector, 0, struct_size(q_vector, ring, ring_count));
if (!q_vector)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index f5c00cf57d43..030085d878d9 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -858,7 +858,7 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter,
q_vector = kzalloc_node(struct_size(q_vector, ring, ring_count),
GFP_KERNEL, node);
if (!q_vector)
- q_vector = kzalloc_flex(*q_vector, ring, ring_count, GFP_KERNEL);
+ q_vector = kzalloc_flex(*q_vector, ring, ring_count);
if (!q_vector)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
index 78e19dbb9f3a..8fe263190d38 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
@@ -509,7 +509,7 @@ static int add_res_tree(struct mlx5_core_dev *dev, enum dbg_rsc_type type,
char resn[32];
int i;
- d = kzalloc_flex(*d, fields, nfile, GFP_KERNEL);
+ d = kzalloc_flex(*d, fields, nfile);
if (!d)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 4678c2c93423..d0103b232c0c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1548,7 +1548,7 @@ static struct mlx5_flow_handle *alloc_handle(int num_rules)
{
struct mlx5_flow_handle *handle;
- handle = kzalloc_flex(*handle, rule, num_rules, GFP_KERNEL);
+ handle = kzalloc_flex(*handle, rule, num_rules);
if (!handle)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
index 653faec72da5..fdbdcadef63b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
@@ -460,7 +460,7 @@ static struct mlx5_fs_bulk *mlx5_fc_bulk_create(struct mlx5_core_dev *dev,
alloc_bitmask = MLX5_CAP_GEN(dev, flow_counter_bulk_alloc);
bulk_len = alloc_bitmask > 0 ? MLX5_FC_BULK_NUM_FCS(alloc_bitmask) : 1;
- fc_bulk = kvzalloc_flex(*fc_bulk, fcs, bulk_len, GFP_KERNEL);
+ fc_bulk = kvzalloc_flex(*fc_bulk, fcs, bulk_len);
if (!fc_bulk)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c
index 505b25e8da7f..86828e329187 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c
@@ -117,7 +117,7 @@ mlx5_fs_hws_pr_bulk_create(struct mlx5_core_dev *dev, void *pool_ctx)
return NULL;
pr_pool_ctx = pool_ctx;
bulk_len = MLX5_FS_HWS_DEFAULT_BULK_LEN;
- pr_bulk = kvzalloc_flex(*pr_bulk, prs_data, bulk_len, GFP_KERNEL);
+ pr_bulk = kvzalloc_flex(*pr_bulk, prs_data, bulk_len);
if (!pr_bulk)
return NULL;
@@ -273,7 +273,7 @@ mlx5_fs_hws_mh_bulk_create(struct mlx5_core_dev *dev, void *pool_ctx)
pattern = pool_ctx;
bulk_len = MLX5_FS_HWS_DEFAULT_BULK_LEN;
- mh_bulk = kvzalloc_flex(*mh_bulk, mhs_data, bulk_len, GFP_KERNEL);
+ mh_bulk = kvzalloc_flex(*mh_bulk, mhs_data, bulk_len);
if (!mh_bulk)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
index 3b6b17c48a18..a937ac667ddd 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
@@ -1453,7 +1453,7 @@ int mlxsw_env_init(struct mlxsw_core *mlxsw_core,
mlxsw_reg_mgpir_max_modules_per_slot_get(mgpir_pl) :
module_count;
- env = kzalloc_flex(*env, line_cards, num_of_slots + 1, GFP_KERNEL);
+ env = kzalloc_flex(*env, line_cards, num_of_slots + 1);
if (!env)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c
index 6aa1252cbe49..5ede8e7b91f3 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c
@@ -224,7 +224,7 @@ mlxsw_sp1_kvdl_part_init(struct mlxsw_sp *mlxsw_sp,
}
nr_entries = div_u64(resource_size, info->alloc_size);
- part = kzalloc_flex(*part, usage, BITS_TO_LONGS(nr_entries), GFP_KERNEL);
+ part = kzalloc_flex(*part, usage, BITS_TO_LONGS(nr_entries));
if (!part)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c
index 33ef49de4e0b..c08b3ec2b600 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c
@@ -124,7 +124,7 @@ int mlxsw_sp_counter_pool_init(struct mlxsw_sp *mlxsw_sp)
struct mlxsw_sp_counter_pool *pool;
int err;
- pool = kzalloc_flex(*pool, sub_pools, sub_pools_count, GFP_KERNEL);
+ pool = kzalloc_flex(*pool, sub_pools, sub_pools_count);
if (!pool)
return -ENOMEM;
mlxsw_sp->counter_pool = pool;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 1124f5feeb23..a7ed770d49cc 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -5198,7 +5198,7 @@ mlxsw_sp_nexthop_obj_group_info_init(struct mlxsw_sp *mlxsw_sp,
return -EINVAL;
}
- nhgi = kzalloc_flex(*nhgi, nexthops, nhs, GFP_KERNEL);
+ nhgi = kzalloc_flex(*nhgi, nexthops, nhs);
if (!nhgi)
return -ENOMEM;
nh_grp->nhgi = nhgi;
@@ -5779,7 +5779,7 @@ mlxsw_sp_nexthop4_group_info_init(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_nexthop *nh;
int err, i;
- nhgi = kzalloc_flex(*nhgi, nexthops, nhs, GFP_KERNEL);
+ nhgi = kzalloc_flex(*nhgi, nexthops, nhs);
if (!nhgi)
return -ENOMEM;
nh_grp->nhgi = nhgi;
@@ -7032,7 +7032,7 @@ mlxsw_sp_nexthop6_group_info_init(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_nexthop *nh;
int err, i;
- nhgi = kzalloc_flex(*nhgi, nexthops, fib6_entry->nrt6, GFP_KERNEL);
+ nhgi = kzalloc_flex(*nhgi, nexthops, fib6_entry->nrt6);
if (!nhgi)
return -ENOMEM;
nh_grp->nhgi = nhgi;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
index 8ee83d35be9a..ae63d549b542 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
@@ -87,7 +87,7 @@ int mlxsw_sp_span_init(struct mlxsw_sp *mlxsw_sp)
return -EIO;
entries_count = MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_SPAN);
- span = kzalloc_flex(*span, entries, entries_count, GFP_KERNEL);
+ span = kzalloc_flex(*span, entries, entries_count);
if (!span)
return -ENOMEM;
refcount_set(&span->policer_id_base_ref_count, 0);
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
index e4e1af365460..9fb91d4f3971 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
@@ -1640,7 +1640,7 @@ static int fbnic_alloc_napi_vector(struct fbnic_dev *fbd, struct fbnic_net *fbn,
return -EIO;
/* Allocate NAPI vector and queue triads */
- nv = kzalloc_flex(*nv, qt, qt_count, GFP_KERNEL);
+ nv = kzalloc_flex(*nv, qt, qt_count);
if (!nv)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c
index 9ee0f7f110dd..ba3467f1e2ea 100644
--- a/drivers/net/ethernet/microsoft/mana/hw_channel.c
+++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c
@@ -461,7 +461,7 @@ static int mana_hwc_alloc_dma_buf(struct hw_channel_context *hwc, u16 q_depth,
int err;
u16 i;
- dma_buf = kzalloc_flex(*dma_buf, reqs, q_depth, GFP_KERNEL);
+ dma_buf = kzalloc_flex(*dma_buf, reqs, q_depth);
if (!dma_buf)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index dad52eaa152f..0422a1c2535b 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -2637,7 +2637,7 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc,
gc = gd->gdma_context;
- rxq = kzalloc_flex(*rxq, rx_oobs, apc->rx_queue_size, GFP_KERNEL);
+ rxq = kzalloc_flex(*rxq, rx_oobs, apc->rx_queue_size);
if (!rxq)
return NULL;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
index bac4c61f8632..6f9f67a31d2f 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
@@ -500,7 +500,7 @@ struct nfp_reprs *nfp_reprs_alloc(unsigned int num_reprs)
{
struct nfp_reprs *reprs;
- reprs = kzalloc_flex(*reprs, reprs, num_reprs, GFP_KERNEL);
+ reprs = kzalloc_flex(*reprs, reprs, num_reprs);
if (!reprs)
return NULL;
reprs->num_reprs = num_reprs;
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
index 9a1f1849e0db..b0c799fb3013 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
@@ -319,7 +319,7 @@ __nfp_eth_read_ports(struct nfp_cpp *cpp, struct nfp_nsp *nsp)
goto err;
}
- table = kzalloc_flex(*table, ports, cnt, GFP_KERNEL);
+ table = kzalloc_flex(*table, ports, cnt);
if (!table)
goto err;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
index 0a0789aaaa53..a0c75886587c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
@@ -1095,7 +1095,7 @@ static int stmmac_test_rxp(struct stmmac_priv *priv)
if (!priv->dma_cap.frpsel)
return -EOPNOTSUPP;
- sel = kzalloc_flex(*sel, keys, nk, GFP_KERNEL);
+ sel = kzalloc_flex(*sel, keys, nk);
if (!sel)
return -ENOMEM;
@@ -1368,7 +1368,7 @@ static int __stmmac_test_l3filt(struct stmmac_priv *priv, u32 dst, u32 src,
cls->command = FLOW_CLS_REPLACE;
cls->cookie = dummy_cookie;
- rule = kzalloc_flex(*rule, action.entries, 1, GFP_KERNEL);
+ rule = kzalloc_flex(*rule, action.entries, 1);
if (!rule) {
ret = -ENOMEM;
goto cleanup_cls;
@@ -1496,7 +1496,7 @@ static int __stmmac_test_l4filt(struct stmmac_priv *priv, u32 dst, u32 src,
cls->command = FLOW_CLS_REPLACE;
cls->cookie = dummy_cookie;
- rule = kzalloc_flex(*rule, action.entries, 1, GFP_KERNEL);
+ rule = kzalloc_flex(*rule, action.entries, 1);
if (!rule) {
ret = -ENOMEM;
goto cleanup_cls;
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
index 08dd0e4c3bc3..746623fa59b4 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
@@ -2095,7 +2095,7 @@ static int wx_alloc_q_vector(struct wx *wx,
/* note this will allocate space for the ring structure as well! */
ring_count = txr_count + rxr_count;
- q_vector = kzalloc_flex(*q_vector, ring, ring_count, GFP_KERNEL);
+ q_vector = kzalloc_flex(*q_vector, ring, ring_count);
if (!q_vector)
return -ENOMEM;
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index d24443390932..3f7707118450 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -598,7 +598,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,
ports = 4;
}
- card = kzalloc_flex(*card, ports, ports, GFP_KERNEL);
+ card = kzalloc_flex(*card, ports, ports);
if (!card) {
pci_release_regions(pdev);
pci_disable_device(pdev);
diff --git a/drivers/net/wireless/ath/ath11k/ce.c b/drivers/net/wireless/ath/ath11k/ce.c
index b91f8bb9a81c..f2d5106adb01 100644
--- a/drivers/net/wireless/ath/ath11k/ce.c
+++ b/drivers/net/wireless/ath/ath11k/ce.c
@@ -615,7 +615,7 @@ ath11k_ce_alloc_ring(struct ath11k_base *ab, int nentries, int desc_sz)
struct ath11k_ce_ring *ce_ring;
dma_addr_t base_addr;
- ce_ring = kzalloc_flex(*ce_ring, skb, nentries, GFP_KERNEL);
+ ce_ring = kzalloc_flex(*ce_ring, skb, nentries);
if (ce_ring == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
index 0cf830d97dbd..0879a132b67c 100644
--- a/drivers/net/wireless/ath/ath11k/reg.c
+++ b/drivers/net/wireless/ath/ath11k/reg.c
@@ -146,7 +146,7 @@ int ath11k_reg_update_chan_list(struct ath11k *ar, bool wait)
if (WARN_ON(!num_channels))
return -EINVAL;
- params = kzalloc_flex(*params, ch_param, num_channels, GFP_KERNEL);
+ params = kzalloc_flex(*params, ch_param, num_channels);
if (!params)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath12k/ce.c b/drivers/net/wireless/ath/ath12k/ce.c
index 1106671dc844..67bbc6d8d0c9 100644
--- a/drivers/net/wireless/ath/ath12k/ce.c
+++ b/drivers/net/wireless/ath/ath12k/ce.c
@@ -332,7 +332,7 @@ ath12k_ce_alloc_ring(struct ath12k_base *ab, int nentries, int desc_sz)
struct ath12k_ce_ring *ce_ring;
dma_addr_t base_addr;
- ce_ring = kzalloc_flex(*ce_ring, skb, nentries, GFP_KERNEL);
+ ce_ring = kzalloc_flex(*ce_ring, skb, nentries);
if (!ce_ring)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/wireless/ath/ath12k/reg.c b/drivers/net/wireless/ath/ath12k/reg.c
index cd9ed489369e..d784d9ec5061 100644
--- a/drivers/net/wireless/ath/ath12k/reg.c
+++ b/drivers/net/wireless/ath/ath12k/reg.c
@@ -170,7 +170,7 @@ int ath12k_reg_update_chan_list(struct ath12k *ar, bool wait)
return -EINVAL;
}
- arg = kzalloc_flex(*arg, channel, num_channels, GFP_KERNEL);
+ arg = kzalloc_flex(*arg, channel, num_channels);
if (!arg)
return -ENOMEM;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c
index 1a6cb3450d58..6cb8343da936 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c
@@ -23,7 +23,7 @@ static int brcmf_bca_alloc_fweh_info(struct brcmf_pub *drvr)
{
struct brcmf_fweh_info *fweh;
- fweh = kzalloc_flex(*fweh, evt_handler, BRCMF_BCA_E_LAST, GFP_KERNEL);
+ fweh = kzalloc_flex(*fweh, evt_handler, BRCMF_BCA_E_LAST);
if (!fweh)
return -ENOMEM;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index cdc9dc733f5b..b6027d83e6ab 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -132,7 +132,7 @@ static int brcmf_c_download_blob(struct brcmf_if *ifp,
brcmf_dbg(TRACE, "Enter\n");
- chunk_buf = kzalloc_flex(*chunk_buf, data, MAX_CHUNK_LEN, GFP_KERNEL);
+ chunk_buf = kzalloc_flex(*chunk_buf, data, MAX_CHUNK_LEN);
if (!chunk_buf) {
err = -ENOMEM;
return -ENOMEM;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c
index abd38ac8c51e..ce09d44fa73c 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c
@@ -66,7 +66,7 @@ static int brcmf_cyw_alloc_fweh_info(struct brcmf_pub *drvr)
{
struct brcmf_fweh_info *fweh;
- fweh = kzalloc_flex(*fweh, evt_handler, BRCMF_CYW_E_LAST, GFP_KERNEL);
+ fweh = kzalloc_flex(*fweh, evt_handler, BRCMF_CYW_E_LAST);
if (!fweh)
return -ENOMEM;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
index 9d05a0f656f4..4bacd83db052 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -825,7 +825,7 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev,
return NULL;
}
- fwreq = kzalloc_flex(*fwreq, items, n_fwnames, GFP_KERNEL);
+ fwreq = kzalloc_flex(*fwreq, items, n_fwnames);
if (!fwreq)
return NULL;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c
index 9a8351537938..e14b5530f720 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c
@@ -24,7 +24,7 @@ static int brcmf_wcc_alloc_fweh_info(struct brcmf_pub *drvr)
{
struct brcmf_fweh_info *fweh;
- fweh = kzalloc_flex(*fweh, evt_handler, BRCMF_WCC_E_LAST, GFP_KERNEL);
+ fweh = kzalloc_flex(*fweh, evt_handler, BRCMF_WCC_E_LAST);
if (!fweh)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c b/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
index f723884e2a62..6de2517188f7 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
@@ -1067,7 +1067,7 @@ iwl_parse_eeprom_data(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg,
if (WARN_ON(!cfg || !cfg->eeprom_params))
return NULL;
- data = kzalloc_flex(*data, channels, IWL_NUM_CHANNELS, GFP_KERNEL);
+ data = kzalloc_flex(*data, channels, IWL_NUM_CHANNELS);
if (!data)
return NULL;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
index ac8b64fec96d..d021b24d04d6 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
@@ -71,7 +71,7 @@ static struct iwl_ucode_tlv *iwl_dbg_tlv_add(const struct iwl_ucode_tlv *tlv,
u32 len = le32_to_cpu(tlv->length);
struct iwl_dbg_tlv_node *node;
- node = kzalloc_flex(*node, tlv.data, len, GFP_KERNEL);
+ node = kzalloc_flex(*node, tlv.data, len);
if (!node)
return NULL;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 75d1db91314b..9e8977f4f072 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -1687,7 +1687,7 @@ iwl_parse_nvm_mcc_info(struct iwl_trans *trans,
num_of_ch);
/* build a regdomain rule for every valid channel */
- regd = kzalloc_flex(*regd, reg_rules, num_of_ch, GFP_KERNEL);
+ regd = kzalloc_flex(*regd, reg_rules, num_of_ch);
if (!regd)
return ERR_PTR(-ENOMEM);
@@ -2036,7 +2036,7 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,
if (empty_otp)
IWL_INFO(trans, "OTP is empty\n");
- nvm = kzalloc_flex(*nvm, channels, IWL_NUM_CHANNELS, GFP_KERNEL);
+ nvm = kzalloc_flex(*nvm, channels, IWL_NUM_CHANNELS);
if (!nvm) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/d3.c b/drivers/net/wireless/intel/iwlwifi/mld/d3.c
index 5ececb849786..467211014977 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/d3.c
@@ -1172,7 +1172,7 @@ iwl_mld_set_netdetect_info(struct iwl_mld *mld,
for (int k = 0; k < SCAN_OFFLOAD_MATCHING_CHANNELS_LEN; k++)
n_channels +=
hweight8(matches[i].matching_channels[k]);
- match = kzalloc_flex(*match, channels, n_channels, GFP_KERNEL);
+ match = kzalloc_flex(*match, channels, n_channels);
if (!match)
return;
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
index 54e128fd0141..0c53d6bd9651 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
@@ -2092,7 +2092,7 @@ static int iwl_mld_alloc_ptk_pn(struct iwl_mld *mld,
return -EINVAL;
WARN_ON(rcu_access_pointer(mld_sta->ptk_pn[keyidx]));
- *ptk_pn = kzalloc_flex(**ptk_pn, q, num_rx_queues, GFP_KERNEL);
+ *ptk_pn = kzalloc_flex(**ptk_pn, q, num_rx_queues);
if (!*ptk_pn)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 66f4b3c98580..a19f9d2e9346 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -2605,7 +2605,7 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,
n_matches = 0;
}
- net_detect = kzalloc_flex(*net_detect, matches, n_matches, GFP_KERNEL);
+ net_detect = kzalloc_flex(*net_detect, matches, n_matches);
if (!net_detect || !n_matches)
goto out_report_nd;
net_detect->n_matches = n_matches;
@@ -2619,7 +2619,7 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,
d3_data->nd_results,
i);
- match = kzalloc_flex(*match, channels, n_channels, GFP_KERNEL);
+ match = kzalloc_flex(*match, channels, n_channels);
if (!match)
goto out_report_nd;
match->n_channels = n_channels;
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index f8f84fc670f3..85512f526c5f 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
@@ -1052,7 +1052,7 @@ mwifiex_create_custom_regdomain(struct mwifiex_private *priv,
if (WARN_ON_ONCE(num_chan > NL80211_MAX_SUPP_REG_RULES))
return ERR_PTR(-EINVAL);
- regd = kzalloc_flex(*regd, reg_rules, num_chan, GFP_KERNEL);
+ regd = kzalloc_flex(*regd, reg_rules, num_chan);
if (!regd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
index 144c336e13a2..bf1babac3895 100644
--- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
+++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
@@ -248,7 +248,7 @@ int mt76_rx_aggr_start(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tidno,
mt76_rx_aggr_stop(dev, wcid, tidno);
- tid = kzalloc_flex(*tid, reorder_buf, size, GFP_KERNEL);
+ tid = kzalloc_flex(*tid, reorder_buf, size);
if (!tid)
return -ENOMEM;
diff --git a/drivers/net/wireless/realtek/rtw89/acpi.c b/drivers/net/wireless/realtek/rtw89/acpi.c
index 0853b2e49675..ebb6cf555747 100644
--- a/drivers/net/wireless/realtek/rtw89/acpi.c
+++ b/drivers/net/wireless/realtek/rtw89/acpi.c
@@ -115,7 +115,7 @@ rtw89_acpi_evaluate_method(struct rtw89_dev *rtwdev, const char *method)
goto out;
}
- data = kzalloc_flex(*data, buf, len, GFP_KERNEL);
+ data = kzalloc_flex(*data, buf, len);
if (!data)
goto out;