The size argument is neither passed to nor returned from kfd_create_crat_image_virtual(). Since it is unused, remove it from the function and update the callers accordingly.
Signed-off-by: Donet Tom <[email protected]> --- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 11 +++++------ drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 4 ++-- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 12 ++++-------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c index 2a239f45fc24..3190a4d6acc6 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c @@ -2412,8 +2412,8 @@ static int kfd_create_vcrat_image_gpu(void *pcrat_image, * * Return 0 if successful else return -ve value */ -int kfd_create_crat_image_virtual(void **crat_image, size_t *size, - int flags, struct kfd_node *kdev, +int kfd_create_crat_image_virtual(void **crat_image, int flags, + struct kfd_node *kdev, uint32_t proximity_domain) { void *pcrat_image = NULL; @@ -2440,9 +2440,8 @@ int kfd_create_crat_image_virtual(void **crat_image, size_t *size, pcrat_image = kvmalloc(dyn_size, GFP_KERNEL); if (!pcrat_image) return -ENOMEM; - *size = dyn_size; pr_debug("CRAT size is %ld", dyn_size); - ret = kfd_create_vcrat_image_cpu(pcrat_image, size); + ret = kfd_create_vcrat_image_cpu(pcrat_image, &dyn_size); break; case COMPUTE_UNIT_GPU: if (!kdev) @@ -2450,8 +2449,8 @@ int kfd_create_crat_image_virtual(void **crat_image, size_t *size, pcrat_image = kvmalloc(VCRAT_SIZE_FOR_GPU, GFP_KERNEL); if (!pcrat_image) return -ENOMEM; - *size = VCRAT_SIZE_FOR_GPU; - ret = kfd_create_vcrat_image_gpu(pcrat_image, size, kdev, + dyn_size = VCRAT_SIZE_FOR_GPU; + ret = kfd_create_vcrat_image_gpu(pcrat_image, &dyn_size, kdev, proximity_domain); break; case (COMPUTE_UNIT_CPU | COMPUTE_UNIT_GPU): diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.h b/drivers/gpu/drm/amd/amdkfd/kfd_crat.h index a8ca7ecb6d27..252fa94aaab9 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.h @@ -313,8 +313,8 @@ int kfd_get_gpu_cache_info(struct kfd_node *kdev, struct kfd_gpu_cache_info **pc void kfd_destroy_crat_image(void *crat_image); int kfd_parse_crat_table(void *crat_image, struct list_head *device_list, uint32_t proximity_domain); -int kfd_create_crat_image_virtual(void **crat_image, size_t *size, - int flags, struct kfd_node *kdev, +int kfd_create_crat_image_virtual(void **crat_image, int flags, + struct kfd_node *kdev, uint32_t proximity_domain); #endif /* KFD_CRAT_H_INCLUDED */ diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index 00517c3d0e6a..f4b7cb44daff 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -996,7 +996,6 @@ static void kfd_add_non_crat_information(struct kfd_topology_device *kdev) int kfd_topology_init(void) { void *crat_image = NULL; - size_t image_size = 0; int ret; struct list_head temp_topology_device_list; int cpu_only_node = 0; @@ -1023,9 +1022,8 @@ int kfd_topology_init(void) */ proximity_domain = 0; - ret = kfd_create_crat_image_virtual(&crat_image, &image_size, - COMPUTE_UNIT_CPU, NULL, - proximity_domain); + ret = kfd_create_crat_image_virtual(&crat_image, COMPUTE_UNIT_CPU, + NULL, proximity_domain); cpu_only_node = 1; if (ret) { pr_err("Error creating VCRAT table for CPU\n"); @@ -1871,12 +1869,10 @@ static int kfd_topology_add_device_locked(struct kfd_node *gpu, int proximity_domain = ++topology_crat_proximity_domain; struct list_head temp_topology_device_list; void *crat_image = NULL; - size_t image_size = 0; int res; - res = kfd_create_crat_image_virtual(&crat_image, &image_size, - COMPUTE_UNIT_GPU, gpu, - proximity_domain); + res = kfd_create_crat_image_virtual(&crat_image, COMPUTE_UNIT_GPU, + gpu, proximity_domain); if (res) { dev_err(gpu->adev->dev, "Error creating VCRAT\n"); topology_crat_proximity_domain--; -- 2.54.0
