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/gpu | |
| parent | 32a92f8c89326985e05dce8b22d3f0aa07a3e1bd (diff) | |
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>
Diffstat (limited to 'drivers/gpu')
51 files changed, 80 insertions, 120 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; diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index 953228cc46cb..170113520a43 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -4605,8 +4605,7 @@ int drm_dp_mst_atomic_setup_commit(struct drm_atomic_state *state) num_commit_deps = hweight32(mst_state->pending_crtc_mask); mst_state->commit_deps = kmalloc_objs(*mst_state->commit_deps, - num_commit_deps, - GFP_KERNEL); + num_commit_deps); if (!mst_state->commit_deps) return -ENOMEM; mst_state->num_commit_deps = num_commit_deps; diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 664c72087da6..f2cd2e25f009 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -136,12 +136,11 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state) if (!state->crtcs) goto fail; state->planes = kzalloc_objs(*state->planes, - dev->mode_config.num_total_plane, - GFP_KERNEL); + dev->mode_config.num_total_plane); if (!state->planes) goto fail; state->colorops = kzalloc_objs(*state->colorops, - dev->mode_config.num_colorop, GFP_KERNEL); + dev->mode_config.num_colorop); if (!state->colorops) goto fail; diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c index 2d14660f3d45..dbf984f8e301 100644 --- a/drivers/gpu/drm/drm_buddy.c +++ b/drivers/gpu/drm/drm_buddy.c @@ -326,7 +326,7 @@ int drm_buddy_init(struct drm_buddy *mm, u64 size, u64 chunk_size) for_each_free_tree(i) { mm->free_trees[i] = kmalloc_objs(struct rb_root, - mm->max_order + 1, GFP_KERNEL); + mm->max_order + 1); if (!mm->free_trees[i]) goto out_free_tree; diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c index 65fbdf3a04f9..262b1b8773c5 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -59,8 +59,7 @@ int drm_client_modeset_create(struct drm_client_dev *client) for (modeset = client->modesets; modeset->crtc; modeset++) { modeset->connectors = kzalloc_objs(*modeset->connectors, - max_connector_count, - GFP_KERNEL); + max_connector_count); if (!modeset->connectors) goto err_free; } diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 6d0bf06b4d31..90684f30a048 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -846,8 +846,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, } connector_set = kmalloc_objs(struct drm_connector *, - crtc_req->count_connectors, - GFP_KERNEL); + crtc_req->count_connectors); if (!connector_set) { ret = -ENOMEM; goto out; diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 75b3cf9c1a32..5de9aaa5ba04 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -603,14 +603,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, * connector data. */ save_encoder_crtcs = kzalloc_objs(struct drm_crtc *, - dev->mode_config.num_encoder, - GFP_KERNEL); + dev->mode_config.num_encoder); if (!save_encoder_crtcs) return -ENOMEM; save_connector_encoders = kzalloc_objs(struct drm_encoder *, - dev->mode_config.num_connector, - GFP_KERNEL); + dev->mode_config.num_connector); if (!save_connector_encoders) { kfree(save_encoder_crtcs); return -ENOMEM; diff --git a/drivers/gpu/drm/i915/display/intel_display_power_map.c b/drivers/gpu/drm/i915/display/intel_display_power_map.c index 28b15d9ee45e..c559ff000e67 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power_map.c +++ b/drivers/gpu/drm/i915/display/intel_display_power_map.c @@ -1824,7 +1824,7 @@ __set_power_wells(struct i915_power_domains *power_domains, power_domains->power_well_count = power_well_count; power_domains->power_wells = kzalloc_objs(*power_domains->power_wells, - power_well_count, GFP_KERNEL); + power_well_count); if (!power_domains->power_wells) return -ENOMEM; diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 7c276b7cc929..555d35bae887 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -2328,8 +2328,7 @@ static int initialize_hdcp_port_data(struct intel_connector *connector, if (!data->streams) data->streams = kzalloc_objs(struct hdcp2_streamid_type, - INTEL_NUM_PIPES(display), - GFP_KERNEL); + INTEL_NUM_PIPES(display)); if (!data->streams) { drm_err(display->drm, "Out of Memory\n"); return -ENOMEM; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c index 77bd4152a6c1..865b61057566 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c @@ -990,8 +990,7 @@ guc_capture_alloc_one_node(struct intel_guc *guc) for (i = 0; i < GUC_CAPTURE_LIST_TYPE_MAX; ++i) { new->reginfo[i].regs = kzalloc_objs(struct guc_mmio_reg, - guc->capture->max_mmio_per_node, - GFP_KERNEL); + guc->capture->max_mmio_per_node); if (!new->reginfo[i].regs) { while (i) kfree(new->reginfo[--i].regs); diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouveau/nouveau_sched.c index 9bd3dc16a467..5546be488795 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sched.c +++ b/drivers/gpu/drm/nouveau/nouveau_sched.c @@ -70,16 +70,14 @@ nouveau_job_init(struct nouveau_job *job, } job->out_sync.objs = kzalloc_objs(*job->out_sync.objs, - job->out_sync.count, - GFP_KERNEL); + job->out_sync.count); if (!job->out_sync.objs) { ret = -ENOMEM; goto err_free_out_sync; } job->out_sync.chains = kzalloc_objs(*job->out_sync.chains, - job->out_sync.count, - GFP_KERNEL); + job->out_sync.count); if (!job->out_sync.chains) { ret = -ENOMEM; goto err_free_objs; diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c index 18054952337f..a2c702b831a7 100644 --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c @@ -886,7 +886,7 @@ static int omap_dmm_probe(struct platform_device *dev) /* alloc engines */ omap_dmm->engines = kzalloc_objs(*omap_dmm->engines, - omap_dmm->num_engines, GFP_KERNEL); + omap_dmm->num_engines); if (!omap_dmm->engines) { ret = -ENOMEM; goto fail; diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c index c5ebe68d5a97..41604a7aaf85 100644 --- a/drivers/gpu/drm/panthor/panthor_mmu.c +++ b/drivers/gpu/drm/panthor/panthor_mmu.c @@ -1258,7 +1258,7 @@ static int panthor_vm_prepare_map_op_ctx(struct panthor_vm_op_ctx *op_ctx, ((ALIGN(va + size, 1ull << 21) - ALIGN_DOWN(va, 1ull << 21)) >> 21); op_ctx->rsvd_page_tables.pages = kzalloc_objs(*op_ctx->rsvd_page_tables.pages, - pt_count, GFP_KERNEL); + pt_count); if (!op_ctx->rsvd_page_tables.pages) { ret = -ENOMEM; goto err_cleanup; @@ -1312,8 +1312,7 @@ static int panthor_vm_prepare_unmap_op_ctx(struct panthor_vm_op_ctx *op_ctx, if (pt_count) { op_ctx->rsvd_page_tables.pages = kzalloc_objs(*op_ctx->rsvd_page_tables.pages, - pt_count, - GFP_KERNEL); + pt_count); if (!op_ctx->rsvd_page_tables.pages) { ret = -ENOMEM; goto err_cleanup; diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 8b2b6c54e86a..75d47e6b9142 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -59,8 +59,7 @@ static int qxl_alloc_client_monitors_config(struct qxl_device *qdev, } if (!qdev->client_monitors_config) { qdev->client_monitors_config = kzalloc_flex(*qdev->client_monitors_config, - heads, count, - GFP_KERNEL); + heads, count); if (!qdev->client_monitors_config) return -ENOMEM; } diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index 0041623b5add..22321eb95b7d 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -5518,7 +5518,7 @@ static int ci_parse_power_table(struct radeon_device *rdev) le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset)); rdev->pm.dpm.ps = kzalloc_objs(struct radeon_ps, - state_array->ucNumEntries, GFP_KERNEL); + state_array->ucNumEntries); if (!rdev->pm.dpm.ps) return -ENOMEM; power_state_offset = (u8 *)state_array->states; diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c index 1544c24f4647..1693b36fc52d 100644 --- a/drivers/gpu/drm/radeon/kv_dpm.c +++ b/drivers/gpu/drm/radeon/kv_dpm.c @@ -2458,7 +2458,7 @@ static int kv_parse_power_table(struct radeon_device *rdev) le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset)); rdev->pm.dpm.ps = kzalloc_objs(struct radeon_ps, - state_array->ucNumEntries, GFP_KERNEL); + state_array->ucNumEntries); if (!rdev->pm.dpm.ps) return -ENOMEM; power_state_offset = (u8 *)state_array->states; diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index 1bcf92f90843..8059e019d4fc 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -4001,8 +4001,7 @@ static int ni_parse_power_table(struct radeon_device *rdev) power_info = (union power_info *)(mode_info->atom_context->bios + data_offset); rdev->pm.dpm.ps = kzalloc_objs(struct radeon_ps, - power_info->pplib.ucNumStates, - GFP_KERNEL); + power_info->pplib.ucNumStates); if (!rdev->pm.dpm.ps) return -ENOMEM; diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r600_dpm.c index b4324793c9ff..83f1ae31cbdb 100644 --- a/drivers/gpu/drm/radeon/r600_dpm.c +++ b/drivers/gpu/drm/radeon/r600_dpm.c @@ -822,8 +822,7 @@ static int r600_parse_clk_voltage_dep_table(struct radeon_clock_voltage_dependen ATOM_PPLIB_Clock_Voltage_Dependency_Record *entry; radeon_table->entries = kzalloc_objs(struct radeon_clock_voltage_dependency_entry, - atom_table->ucNumEntries, - GFP_KERNEL); + atom_table->ucNumEntries); if (!radeon_table->entries) return -ENOMEM; @@ -989,7 +988,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) rdev->pm.dpm.dyn_state.phase_shedding_limits_table.entries = kzalloc_objs(struct radeon_phase_shedding_limits_entry, - psl->ucNumEntries, GFP_KERNEL); + psl->ucNumEntries); if (!rdev->pm.dpm.dyn_state.phase_shedding_limits_table.entries) { r600_free_extended_power_table(rdev); return -ENOMEM; diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 2f2b3b716d3d..3dd9724b331d 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -2118,7 +2118,7 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev) if (num_modes == 0) return state_index; rdev->pm.power_state = kzalloc_objs(struct radeon_power_state, - num_modes, GFP_KERNEL); + num_modes); if (!rdev->pm.power_state) return state_index; /* last mode is usually default, array is low to high */ @@ -2590,8 +2590,7 @@ static int radeon_atombios_parse_power_table_4_5(struct radeon_device *rdev) if (power_info->pplib.ucNumStates == 0) return state_index; rdev->pm.power_state = kzalloc_objs(struct radeon_power_state, - power_info->pplib.ucNumStates, - GFP_KERNEL); + power_info->pplib.ucNumStates); if (!rdev->pm.power_state) return state_index; /* first mode is usually default, followed by low to high */ @@ -2608,8 +2607,7 @@ static int radeon_atombios_parse_power_table_4_5(struct radeon_device *rdev) power_info->pplib.ucNonClockSize)); rdev->pm.power_state[i].clock_info = kzalloc_objs(struct radeon_pm_clock_info, - (power_info->pplib.ucStateEntrySize - 1) ? (power_info->pplib.ucStateEntrySize - 1) : 1, - GFP_KERNEL); + (power_info->pplib.ucStateEntrySize - 1) ? (power_info->pplib.ucStateEntrySize - 1) : 1); if (!rdev->pm.power_state[i].clock_info) return state_index; if (power_info->pplib.ucStateEntrySize - 1) { @@ -2692,8 +2690,7 @@ static int radeon_atombios_parse_power_table_6(struct radeon_device *rdev) if (state_array->ucNumEntries == 0) return state_index; rdev->pm.power_state = kzalloc_objs(struct radeon_power_state, - state_array->ucNumEntries, - GFP_KERNEL); + state_array->ucNumEntries); if (!rdev->pm.power_state) return state_index; power_state_offset = (u8 *)state_array->states; @@ -2705,8 +2702,7 @@ static int radeon_atombios_parse_power_table_6(struct radeon_device *rdev) &non_clock_info_array->nonClockInfo[non_clock_array_index]; rdev->pm.power_state[i].clock_info = kzalloc_objs(struct radeon_pm_clock_info, - power_state->v2.ucNumDPMLevels ? power_state->v2.ucNumDPMLevels : 1, - GFP_KERNEL); + power_state->v2.ucNumDPMLevels ? power_state->v2.ucNumDPMLevels : 1); if (!rdev->pm.power_state[i].clock_info) return state_index; if (power_state->v2.ucNumDPMLevels) { diff --git a/drivers/gpu/drm/radeon/rs780_dpm.c b/drivers/gpu/drm/radeon/rs780_dpm.c index af0a032e3ded..64bb4cafb8b5 100644 --- a/drivers/gpu/drm/radeon/rs780_dpm.c +++ b/drivers/gpu/drm/radeon/rs780_dpm.c @@ -805,8 +805,7 @@ static int rs780_parse_power_table(struct radeon_device *rdev) power_info = (union power_info *)(mode_info->atom_context->bios + data_offset); rdev->pm.dpm.ps = kzalloc_objs(struct radeon_ps, - power_info->pplib.ucNumStates, - GFP_KERNEL); + power_info->pplib.ucNumStates); if (!rdev->pm.dpm.ps) return -ENOMEM; diff --git a/drivers/gpu/drm/radeon/rv6xx_dpm.c b/drivers/gpu/drm/radeon/rv6xx_dpm.c index 3cb8842fce65..c734370e5336 100644 --- a/drivers/gpu/drm/radeon/rv6xx_dpm.c +++ b/drivers/gpu/drm/radeon/rv6xx_dpm.c @@ -1888,8 +1888,7 @@ static int rv6xx_parse_power_table(struct radeon_device *rdev) power_info = (union power_info *)(mode_info->atom_context->bios + data_offset); rdev->pm.dpm.ps = kzalloc_objs(struct radeon_ps, - power_info->pplib.ucNumStates, - GFP_KERNEL); + power_info->pplib.ucNumStates); if (!rdev->pm.dpm.ps) return -ENOMEM; diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c index 4d6ed9668ad1..5f5cf5dd1d58 100644 --- a/drivers/gpu/drm/radeon/rv770_dpm.c +++ b/drivers/gpu/drm/radeon/rv770_dpm.c @@ -2284,8 +2284,7 @@ int rv7xx_parse_power_table(struct radeon_device *rdev) power_info = (union power_info *)(mode_info->atom_context->bios + data_offset); rdev->pm.dpm.ps = kzalloc_objs(struct radeon_ps, - power_info->pplib.ucNumStates, - GFP_KERNEL); + power_info->pplib.ucNumStates); if (!rdev->pm.dpm.ps) return -ENOMEM; diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 6613957fff06..b4aa49b1ac63 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -6779,7 +6779,7 @@ static int si_parse_power_table(struct radeon_device *rdev) le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset)); rdev->pm.dpm.ps = kzalloc_objs(struct radeon_ps, - state_array->ucNumEntries, GFP_KERNEL); + state_array->ucNumEntries); if (!rdev->pm.dpm.ps) return -ENOMEM; power_state_offset = (u8 *)state_array->states; diff --git a/drivers/gpu/drm/radeon/sumo_dpm.c b/drivers/gpu/drm/radeon/sumo_dpm.c index 5f14adeee13e..acee6c82e9f0 100644 --- a/drivers/gpu/drm/radeon/sumo_dpm.c +++ b/drivers/gpu/drm/radeon/sumo_dpm.c @@ -1480,7 +1480,7 @@ static int sumo_parse_power_table(struct radeon_device *rdev) le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset)); rdev->pm.dpm.ps = kzalloc_objs(struct radeon_ps, - state_array->ucNumEntries, GFP_KERNEL); + state_array->ucNumEntries); if (!rdev->pm.dpm.ps) return -ENOMEM; power_state_offset = (u8 *)state_array->states; diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c index 34b7beb9cf9a..566615c877cc 100644 --- a/drivers/gpu/drm/radeon/trinity_dpm.c +++ b/drivers/gpu/drm/radeon/trinity_dpm.c @@ -1711,7 +1711,7 @@ static int trinity_parse_power_table(struct radeon_device *rdev) le16_to_cpu(power_info->pplib.usNonClockInfoArrayOffset)); rdev->pm.dpm.ps = kzalloc_objs(struct radeon_ps, - state_array->ucNumEntries, GFP_KERNEL); + state_array->ucNumEntries); if (!rdev->pm.dpm.ps) return -ENOMEM; power_state_offset = (u8 *)state_array->states; diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c index 091f5c7e9730..18f2bf1fe89f 100644 --- a/drivers/gpu/drm/v3d/v3d_submit.c +++ b/drivers/gpu/drm/v3d/v3d_submit.c @@ -485,7 +485,7 @@ v3d_get_cpu_timestamp_query_params(struct drm_file *file_priv, job->job_type = V3D_CPU_JOB_TYPE_TIMESTAMP_QUERY; query_info->queries = kvmalloc_objs(struct v3d_timestamp_query, - timestamp.count, GFP_KERNEL); + timestamp.count); if (!query_info->queries) return -ENOMEM; @@ -543,7 +543,7 @@ v3d_get_cpu_reset_timestamp_params(struct drm_file *file_priv, job->job_type = V3D_CPU_JOB_TYPE_RESET_TIMESTAMP_QUERY; query_info->queries = kvmalloc_objs(struct v3d_timestamp_query, - reset.count, GFP_KERNEL); + reset.count); if (!query_info->queries) return -ENOMEM; @@ -599,7 +599,7 @@ v3d_get_cpu_copy_query_results_params(struct drm_file *file_priv, job->job_type = V3D_CPU_JOB_TYPE_COPY_TIMESTAMP_QUERY; query_info->queries = kvmalloc_objs(struct v3d_timestamp_query, - copy.count, GFP_KERNEL); + copy.count); if (!query_info->queries) return -ENOMEM; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c index 84237edf1ac0..fd77ab6568cb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c @@ -982,8 +982,7 @@ int vmw_mksstat_add_ioctl(struct drm_device *dev, void *data, /* Allocate statically-sized temp arrays for pages -- too big to keep in frame */ pages_stat = (struct page **) kmalloc_objs(*pages_stat, - ARRAY_SIZE(pdesc->statPPNs) + ARRAY_SIZE(pdesc->infoPPNs) + ARRAY_SIZE(pdesc->strsPPNs), - GFP_KERNEL); + ARRAY_SIZE(pdesc->statPPNs) + ARRAY_SIZE(pdesc->infoPPNs) + ARRAY_SIZE(pdesc->strsPPNs)); if (!pages_stat) goto err_nomem; diff --git a/drivers/gpu/drm/xen/xen_drm_front_evtchnl.c b/drivers/gpu/drm/xen/xen_drm_front_evtchnl.c index 88cc85395791..a4888277164d 100644 --- a/drivers/gpu/drm/xen/xen_drm_front_evtchnl.c +++ b/drivers/gpu/drm/xen/xen_drm_front_evtchnl.c @@ -213,7 +213,7 @@ int xen_drm_front_evtchnl_create_all(struct xen_drm_front_info *front_info) front_info->evt_pairs = kzalloc_objs(struct xen_drm_front_evtchnl_pair, - cfg->num_connectors, GFP_KERNEL); + cfg->num_connectors); if (!front_info->evt_pairs) { ret = -ENOMEM; goto fail; |
