Replace the remaining kmalloc_array instances with kmalloc_objs. No functional changes.
Signed-off-by: Lalit Shankar Chowdhury <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c index 132d054900b5..f2427bf07905 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c @@ -986,7 +986,7 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf, if (size & 0x3 || *pos & 0x3) return -EINVAL; - config = kmalloc_array(256, sizeof(*config), GFP_KERNEL); + config = kmalloc_objs(*config, 256); if (!config) return -ENOMEM; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 242c48e85912..f67caa255327 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -900,8 +900,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) if (info->read_mmr_reg.count > 128) return -EINVAL; - regs = kmalloc_array(info->read_mmr_reg.count, sizeof(*regs), - GFP_KERNEL); + regs = kmalloc_objs(*regs, info->read_mmr_reg.count); if (!regs) return -ENOMEM; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c index 743b41db5b7c..cbdbd8196eb2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c @@ -486,8 +486,7 @@ int amdgpu_userq_signal_ioctl(struct drm_device *dev, void *data, if (IS_ERR(syncobj_handles)) return PTR_ERR(syncobj_handles); - syncobj = kmalloc_array(num_syncobj_handles, sizeof(*syncobj), - GFP_KERNEL); + syncobj = kmalloc_objs(*syncobj, num_syncobj_handles); if (!syncobj) { r = -ENOMEM; goto free_syncobj_handles; @@ -726,13 +725,11 @@ amdgpu_userq_wait_return_fence_info(struct drm_device *dev, struct drm_file *fil struct drm_exec exec; int i, cnt, r; - fence_info = kmalloc_array(wait_info->num_fences, sizeof(*fence_info), - GFP_KERNEL); + fence_info = kmalloc_objs(*fence_info, wait_info->num_fences); if (!fence_info) return -ENOMEM; - fences = kmalloc_array(wait_info->num_fences, sizeof(*fences), - GFP_KERNEL); + fences = kmalloc_objs(*fences, wait_info->num_fences); if (!fences) { r = -ENOMEM; goto free_fence_info; -- 2.53.0
