Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL usesHEADtorvalds/mastertorvalds/HEADmaster

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>

24 files changed, 42 insertions, 60 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 04b45242dc76..af3d2fd61cf3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1179,8 +1179,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
 			 */
 			ip_hw_instance = kzalloc_flex(*ip_hw_instance,
 						      base_addr,
-						      ip->num_base_address,
-						      GFP_KERNEL);
+						      ip->num_base_address);
 			if (!ip_hw_instance) {
 				DRM_ERROR("no memory for ip_hw_instance");
 				return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index d9b2252db00e..5179fa008626 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -1728,8 +1728,7 @@ int amdgpu_gmc_init_mem_ranges(struct amdgpu_device *adev)
 	bool valid;
 
 	adev->gmc.mem_partitions = kzalloc_objs(struct amdgpu_mem_partition_info,
-						AMDGPU_MAX_MEM_RANGES,
-						GFP_KERNEL);
+						AMDGPU_MAX_MEM_RANGES);
 	if (!adev->gmc.mem_partitions)
 		return -ENOMEM;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 49eedfbfb5e8..254a4e983f40 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -437,7 +437,7 @@ int amdgpu_irq_add_id(struct amdgpu_device *adev,
 	if (!adev->irq.client[client_id].sources) {
 		adev->irq.client[client_id].sources =
 			kzalloc_objs(struct amdgpu_irq_src *,
-				     AMDGPU_MAX_IRQ_SRC_ID, GFP_KERNEL);
+				     AMDGPU_MAX_IRQ_SRC_ID);
 		if (!adev->irq.client[client_id].sources)
 			return -ENOMEM;
 	}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
index ad5d2fcd03d7..60bbe00e8024 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
@@ -452,8 +452,7 @@ static int amdgpu_pmu_alloc_pmu_attrs(
 		return -ENOMEM;
 
 	fmt_attr_group->attrs = kzalloc_objs(*fmt_attr_group->attrs,
-					     config->num_formats + 1,
-					     GFP_KERNEL);
+					     config->num_formats + 1);
 
 	if (!fmt_attr_group->attrs)
 		goto err_fmt_attr_grp;
@@ -464,7 +463,7 @@ static int amdgpu_pmu_alloc_pmu_attrs(
 		goto err_evt_attr;
 
 	evt_attr_group->attrs = kzalloc_objs(*evt_attr_group->attrs,
-					     config->num_events + 1, GFP_KERNEL);
+					     config->num_events + 1);
 
 	if (!evt_attr_group->attrs)
 		goto err_evt_attr_grp;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index eb3e62eb7b20..c0336ca9bf6a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -3239,7 +3239,7 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
 	if (from_rom) {
 		err_data.err_addr =
 			kzalloc_objs(struct eeprom_table_record,
-				     adev->umc.retire_unit, GFP_KERNEL);
+				     adev->umc.retire_unit);
 		if (!err_data.err_addr) {
 			dev_warn(adev->dev, "Failed to alloc UMC error address record in mca2pa conversion!\n");
 			return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index d319c37e0d4e..eeaa56c8d129 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1881,8 +1881,7 @@ static int amdgpu_ttm_pools_init(struct amdgpu_device *adev)
 		return 0;
 
 	adev->mman.ttm_pools = kzalloc_objs(*adev->mman.ttm_pools,
-					    adev->gmc.num_mem_partitions,
-					    GFP_KERNEL);
+					    adev->gmc.num_mem_partitions);
 	if (!adev->mman.ttm_pools)
 		return -ENOMEM;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
index 8da772ec4b40..4df0f9d5ad11 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
@@ -59,7 +59,7 @@ int amdgpu_umc_page_retirement_mca(struct amdgpu_device *adev,
 
 	err_data.err_addr =
 		kzalloc_objs(struct eeprom_table_record,
-			     adev->umc.max_ras_err_cnt_per_query, GFP_KERNEL);
+			     adev->umc.max_ras_err_cnt_per_query);
 	if (!err_data.err_addr) {
 		dev_warn(adev->dev,
 			"Failed to alloc memory for umc error record in MCA notifier!\n");
@@ -106,7 +106,7 @@ void amdgpu_umc_handle_bad_pages(struct amdgpu_device *adev,
 
 	err_data->err_addr =
 		kzalloc_objs(struct eeprom_table_record,
-			     adev->umc.max_ras_err_cnt_per_query, GFP_KERNEL);
+			     adev->umc.max_ras_err_cnt_per_query);
 
 	/* still call query_ras_error_address to clear error status
 	 * even NOMEM error is encountered
@@ -132,8 +132,7 @@ void amdgpu_umc_handle_bad_pages(struct amdgpu_device *adev,
 			    adev->umc.max_ras_err_cnt_per_query) {
 				err_data->err_addr =
 					kzalloc_objs(struct eeprom_table_record,
-						     adev->umc.max_ras_err_cnt_per_query,
-						     GFP_KERNEL);
+						     adev->umc.max_ras_err_cnt_per_query);
 
 				/* still call query_ras_error_address to clear error status
 				 * even NOMEM error is encountered
@@ -163,8 +162,7 @@ void amdgpu_umc_handle_bad_pages(struct amdgpu_device *adev,
 			    adev->umc.max_ras_err_cnt_per_query) {
 				err_data->err_addr =
 					kzalloc_objs(struct eeprom_table_record,
-						     adev->umc.max_ras_err_cnt_per_query,
-						     GFP_KERNEL);
+						     adev->umc.max_ras_err_cnt_per_query);
 
 				/* still call query_ras_error_address to clear error status
 				 * even NOMEM error is encountered
@@ -554,7 +552,7 @@ int amdgpu_umc_lookup_bad_pages_in_a_row(struct amdgpu_device *adev,
 	struct ras_err_data err_data;
 
 	err_data.err_addr = kzalloc_objs(struct eeprom_table_record,
-					 adev->umc.retire_unit, GFP_KERNEL);
+					 adev->umc.retire_unit);
 	if (!err_data.err_addr) {
 		dev_warn(adev->dev, "Failed to alloc memory in bad page lookup!\n");
 		return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 2c19b65de840..5cef8cd14148 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -500,8 +500,7 @@ static int amdgpu_vkms_sw_init(struct amdgpu_ip_block *ip_block)
 	struct amdgpu_device *adev = ip_block->adev;
 
 	adev->amdgpu_vkms_output = kzalloc_objs(struct amdgpu_vkms_output,
-						adev->mode_info.num_crtc,
-						GFP_KERNEL);
+						adev->mode_info.num_crtc);
 	if (!adev->amdgpu_vkms_output)
 		return -ENOMEM;
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index d0f7bd2a3481..09dabb3b3297 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -781,7 +781,7 @@ static int kfd_ioctl_get_process_apertures_new(struct file *filp,
 	 * the amount of memory allocated by user
 	 */
 	pa = kzalloc_objs(struct kfd_process_device_apertures,
-			  args->num_of_nodes, GFP_KERNEL);
+			  args->num_of_nodes);
 	if (!pa)
 		return -ENOMEM;
 
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
index 212f613fad1e..b96fbc03c371 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
@@ -959,7 +959,7 @@ void amdgpu_dm_crtc_secure_display_create_contexts(struct amdgpu_device *adev)
 	int i;
 
 	crtc_ctx = kzalloc_objs(struct secure_display_crtc_context,
-				adev->mode_info.num_crtc, GFP_KERNEL);
+				adev->mode_info.num_crtc);
 
 	if (!crtc_ctx) {
 		adev->dm.secure_display_ctx.crtc_ctx = NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
index 13ac1980a376..8b555187ac75 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
@@ -2131,7 +2131,7 @@ enum dc_status dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context,
 	display_e2e_pipe_params_st *pipes;
 
 	pipes = kzalloc_objs(display_e2e_pipe_params_st,
-			     dc->res_pool->pipe_count, GFP_KERNEL);
+			     dc->res_pool->pipe_count);
 	if (!pipes)
 		return DC_FAIL_BANDWIDTH_VALIDATE;
 
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
index e83b8cea1e73..0f4307f8f3dd 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
@@ -931,7 +931,7 @@ static enum dc_status dcn21_validate_bandwidth(struct dc *dc, struct dc_state *c
 	display_e2e_pipe_params_st *pipes;
 
 	pipes = kzalloc_objs(display_e2e_pipe_params_st,
-			     dc->res_pool->pipe_count, GFP_KERNEL);
+			     dc->res_pool->pipe_count);
 	if (!pipes)
 		return DC_FAIL_BANDWIDTH_VALIDATE;
 
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
index df0ff1580acc..2fa86b9587ed 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
@@ -2045,8 +2045,7 @@ enum dc_status dcn30_validate_bandwidth(struct dc *dc,
 	int vlevel = 0;
 	int pipe_cnt = 0;
 	display_e2e_pipe_params_st *pipes = kzalloc_objs(display_e2e_pipe_params_st,
-							 dc->res_pool->pipe_count,
-							 GFP_KERNEL);
+							 dc->res_pool->pipe_count);
 	DC_LOGGER_INIT(dc->ctx->logger);
 
 	BW_VAL_TRACE_COUNT();
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
index 41877105f498..2055f1f8af65 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
@@ -1768,8 +1768,7 @@ enum dc_status dcn31_validate_bandwidth(struct dc *dc,
 	int vlevel = 0;
 	int pipe_cnt = 0;
 	display_e2e_pipe_params_st *pipes = kzalloc_objs(display_e2e_pipe_params_st,
-							 dc->res_pool->pipe_count,
-							 GFP_KERNEL);
+							 dc->res_pool->pipe_count);
 	DC_LOGGER_INIT(dc->ctx->logger);
 
 	BW_VAL_TRACE_COUNT();
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
index 2ddc1c10e68c..1939f720ba29 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
@@ -1706,8 +1706,7 @@ enum dc_status dcn314_validate_bandwidth(struct dc *dc,
 	int vlevel = 0;
 	int pipe_cnt = 0;
 	display_e2e_pipe_params_st *pipes = kzalloc_objs(display_e2e_pipe_params_st,
-							 dc->res_pool->pipe_count,
-							 GFP_KERNEL);
+							 dc->res_pool->pipe_count);
 	DC_LOGGER_INIT(dc->ctx->logger);
 
 	BW_VAL_TRACE_COUNT();
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
index f23b7338f759..7ebb7d1193af 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
@@ -1751,8 +1751,7 @@ static bool dml1_validate(struct dc *dc, struct dc_state *context, enum dc_valid
 	int vlevel = 0;
 	int pipe_cnt = 0;
 	display_e2e_pipe_params_st *pipes = kzalloc_objs(display_e2e_pipe_params_st,
-							 dc->res_pool->pipe_count,
-							 GFP_KERNEL);
+							 dc->res_pool->pipe_count);
 
 	/* To handle Freesync properly, setting FreeSync DML parameters
 	 * to its default state for the first stage of validation
diff --git a/drivers/gpu/drm/amd/display/modules/color/color_gamma.c b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c
index 31271fe2a10e..2639163b8ba2 100644
--- a/drivers/gpu/drm/amd/display/modules/color/color_gamma.c
+++ b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c
@@ -1715,14 +1715,12 @@ bool mod_color_calculate_degamma_params(struct dc_color_caps *dc_caps,
 
 	if (map_user_ramp && ramp && ramp->type == GAMMA_RGB_256) {
 		rgb_user = kvzalloc_objs(*rgb_user,
-					 ramp->num_entries + _EXTRA_POINTS,
-					 GFP_KERNEL);
+					 ramp->num_entries + _EXTRA_POINTS);
 		if (!rgb_user)
 			goto rgb_user_alloc_fail;
 
 		axis_x = kvzalloc_objs(*axis_x,
-				       ramp->num_entries + _EXTRA_POINTS,
-				       GFP_KERNEL);
+				       ramp->num_entries + _EXTRA_POINTS);
 		if (!axis_x)
 			goto axis_x_alloc_fail;
 
@@ -1940,8 +1938,7 @@ bool mod_color_calculate_regamma_params(struct dc_transfer_func *output_tf,
 	if (ramp && ramp->type != GAMMA_CS_TFM_1D &&
 	    (map_user_ramp || ramp->type != GAMMA_RGB_256)) {
 		rgb_user = kvzalloc_objs(*rgb_user,
-					 ramp->num_entries + _EXTRA_POINTS,
-					 GFP_KERNEL);
+					 ramp->num_entries + _EXTRA_POINTS);
 		if (!rgb_user)
 			goto rgb_user_alloc_fail;
 
diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
index 7a0d6e05e83b..cdf3f8e6ec2f 100644
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
@@ -2725,7 +2725,7 @@ static int kv_parse_power_table(struct amdgpu_device *adev)
 		 le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset));
 
 	adev->pm.dpm.ps = kzalloc_objs(struct amdgpu_ps,
-				       state_array->ucNumEntries, GFP_KERNEL);
+				       state_array->ucNumEntries);
 	if (!adev->pm.dpm.ps)
 		return -ENOMEM;
 	power_state_offset = (u8 *)state_array->states;
diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
index 72752ddf72a4..6362a14b1a6e 100644
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
@@ -303,7 +303,7 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)
 
 			adev->pm.dpm.dyn_state.phase_shedding_limits_table.entries =
 				kzalloc_objs(struct amdgpu_phase_shedding_limits_entry,
-					     psl->ucNumEntries, GFP_KERNEL);
+					     psl->ucNumEntries);
 			if (!adev->pm.dpm.dyn_state.phase_shedding_limits_table.entries)
 				return -ENOMEM;
 
diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
index 6edefa6ee006..61b1c5aa74cb 100644
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
@@ -7342,7 +7342,7 @@ static int si_parse_power_table(struct amdgpu_device *adev)
 		 le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset));
 
 	adev->pm.dpm.ps = kzalloc_objs(struct amdgpu_ps,
-				       state_array->ucNumEntries, GFP_KERNEL);
+				       state_array->ucNumEntries);
 	if (!adev->pm.dpm.ps)
 		return -ENOMEM;
 	power_state_offset = (u8 *)state_array->states;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
index 5de17e3bb7d7..6fcca65bd7d4 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
@@ -371,7 +371,7 @@ static int get_mclk_voltage_dependency_table(
 		"Invalid PowerPlay Table!", return -1);
 
 	mclk_table = kzalloc_flex(*mclk_table, entries,
-				  mclk_dep_table->ucNumEntries, GFP_KERNEL);
+				  mclk_dep_table->ucNumEntries);
 	if (!mclk_table)
 		return -ENOMEM;
 
@@ -415,7 +415,7 @@ static int get_sclk_voltage_dependency_table(
 			"Invalid PowerPlay Table!", return -1);
 
 		sclk_table = kzalloc_flex(*sclk_table, entries,
-					  tonga_table->ucNumEntries, GFP_KERNEL);
+					  tonga_table->ucNumEntries);
 		if (!sclk_table)
 			return -ENOMEM;
 
@@ -444,8 +444,7 @@ static int get_sclk_voltage_dependency_table(
 			"Invalid PowerPlay Table!", return -1);
 
 		sclk_table = kzalloc_flex(*sclk_table, entries,
-					  polaris_table->ucNumEntries,
-					  GFP_KERNEL);
+					  polaris_table->ucNumEntries);
 		if (!sclk_table)
 			return -ENOMEM;
 
@@ -492,8 +491,7 @@ static int get_pcie_table(
 			"Invalid PowerPlay Table!", return -1);
 
 		pcie_table = kzalloc_flex(*pcie_table, entries,
-					  atom_pcie_table->ucNumEntries,
-					  GFP_KERNEL);
+					  atom_pcie_table->ucNumEntries);
 		if (!pcie_table)
 			return -ENOMEM;
 
@@ -529,8 +527,7 @@ static int get_pcie_table(
 			"Invalid PowerPlay Table!", return -1);
 
 		pcie_table = kzalloc_flex(*pcie_table, entries,
-					  atom_pcie_table->ucNumEntries,
-					  GFP_KERNEL);
+					  atom_pcie_table->ucNumEntries);
 		if (!pcie_table)
 			return -ENOMEM;
 
@@ -725,7 +722,7 @@ static int get_mm_clock_voltage_table(
 	PP_ASSERT_WITH_CODE((0 != mm_dependency_table->ucNumEntries),
 		"Invalid PowerPlay Table!", return -1);
 	mm_table = kzalloc_flex(*mm_table, entries,
-				mm_dependency_table->ucNumEntries, GFP_KERNEL);
+				mm_dependency_table->ucNumEntries);
 	if (!mm_table)
 		return -ENOMEM;
 
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
index a5fb0e883676..59af3314ffc4 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
@@ -1483,7 +1483,7 @@ static int get_cac_leakage_table(struct pp_hwmgr *hwmgr,
 		return -EINVAL;
 
 	cac_leakage_table = kzalloc_flex(*cac_leakage_table, entries,
-					 table->ucNumEntries, GFP_KERNEL);
+					 table->ucNumEntries);
 	if (!cac_leakage_table)
 		return -ENOMEM;
 
@@ -1621,7 +1621,7 @@ static int init_phase_shedding_table(struct pp_hwmgr *hwmgr,
 
 
 			table = kzalloc_flex(*table, entries,
-					     ptable->ucNumEntries, GFP_KERNEL);
+					     ptable->ucNumEntries);
 			if (!table)
 				return -ENOMEM;
 
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
index 77067e1315d2..052d139584fd 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
@@ -351,7 +351,7 @@ static int get_mm_clock_voltage_table(
 			"Invalid PowerPlay Table!", return -1);
 
 	mm_table = kzalloc_flex(*mm_table, entries,
-				mm_dependency_table->ucNumEntries, GFP_KERNEL);
+				mm_dependency_table->ucNumEntries);
 	if (!mm_table)
 		return -ENOMEM;
 
@@ -574,7 +574,7 @@ static int get_socclk_voltage_dependency_table(
 		"Invalid PowerPlay Table!", return -1);
 
 	clk_table = kzalloc_flex(*clk_table, entries,
-				 clk_dep_table->ucNumEntries, GFP_KERNEL);
+				 clk_dep_table->ucNumEntries);
 	if (!clk_table)
 		return -ENOMEM;
 
@@ -604,7 +604,7 @@ static int get_mclk_voltage_dependency_table(
 		"Invalid PowerPlay Table!", return -1);
 
 	mclk_table = kzalloc_flex(*mclk_table, entries,
-				  mclk_dep_table->ucNumEntries, GFP_KERNEL);
+				  mclk_dep_table->ucNumEntries);
 	if (!mclk_table)
 		return -ENOMEM;
 
@@ -641,7 +641,7 @@ static int get_gfxclk_voltage_dependency_table(
 			"Invalid PowerPlay Table!", return -1);
 
 	clk_table = kzalloc_flex(*clk_table, entries,
-				 clk_dep_table->ucNumEntries, GFP_KERNEL);
+				 clk_dep_table->ucNumEntries);
 	if (!clk_table)
 		return -ENOMEM;
 
@@ -703,7 +703,7 @@ static int get_pix_clk_voltage_dependency_table(
 			"Invalid PowerPlay Table!", return -1);
 
 	clk_table = kzalloc_flex(*clk_table, entries,
-				 clk_dep_table->ucNumEntries, GFP_KERNEL);
+				 clk_dep_table->ucNumEntries);
 	if (!clk_table)
 		return -ENOMEM;
 
@@ -794,7 +794,7 @@ static int get_pcie_table(struct pp_hwmgr *hwmgr,
 			return 0);
 
 	pcie_table = kzalloc_flex(*pcie_table, entries,
-				  atom_pcie_table->ucNumEntries, GFP_KERNEL);
+				  atom_pcie_table->ucNumEntries);
 	if (!pcie_table)
 		return -ENOMEM;
 
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
index f4f8b2132edd..af0482c9caa7 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -2400,8 +2400,7 @@ static int smu_v13_0_7_get_power_profile_mode(struct smu_context *smu, char *buf
 		return -EINVAL;
 
 	activity_monitor_external = kzalloc_objs(*activity_monitor_external,
-						 PP_SMC_POWER_PROFILE_COUNT,
-						 GFP_KERNEL);
+						 PP_SMC_POWER_PROFILE_COUNT);
 	if (!activity_monitor_external)
 		return -ENOMEM;