drm/amdgpu: remove unused variable j
Subsystems (2)
PATCH 1/1 drm/amdgpu: remove unused variable j
gcc with W=1 reports drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c: In function
‘amdgpu_gfx_mqd_sw_fini’:drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:451:16: error: variable
‘j’ set but not used [-Werror=unused-but-set-variable]
451 | int i, j;
| ^drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c: In function
‘amdgpu_gfx_disable_kcq’:drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:486:13: error: variable
‘j’ set but not used [-Werror=unused-but-set-variable]
486 | int j;
| ^drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c: In function
‘amdgpu_gfx_enable_kcq’:drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:529:19: error: variable
‘j’ set but not used [-Werror=unused-but-set-variable]
529 | int r, i, j;
| ^
These variables are not used, so remove them.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +4 -10
@@ -448,7 +448,7 @@ int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev,void amdgpu_gfx_mqd_sw_fini (struct amdgpu_device *adev,int xcc_id) {struct amdgpu_ring *ring =NULL ; -int i, j; +int i;struct amdgpu_kiq *kiq = &adev->gfx.kiq[xcc_id];if (adev->asic_type >=CHIP_NAVI10 && amdgpu_async_gfx_ring) {
@@ -462,7 +462,6 @@ void amdgpu_gfx_mqd_sw_fini(struct amdgpu_device *adev, int xcc_id) }for (i =0 ; i < adev->gfx.num_compute_rings; i++) { - j = i + xcc_id * adev->gfx.num_compute_rings; ring = &adev->gfx.compute_ring[i];kfree (adev->gfx.mec.mqd_backup[i]); amdgpu_bo_free_kernel(&ring->mqd_obj,
@@ -483,7 +482,6 @@ int amdgpu_gfx_disable_kcq(struct amdgpu_device *adev, int xcc_id)struct amdgpu_kiq *kiq = &adev->gfx.kiq[xcc_id];struct amdgpu_ring *kiq_ring = &kiq->ring;int i, r =0 ; -int j;if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)return -EINVAL ;
@@ -495,11 +493,9 @@ int amdgpu_gfx_disable_kcq(struct amdgpu_device *adev, int xcc_id)return -ENOMEM ; } -for (i =0 ; i < adev->gfx.num_compute_rings; i++) { - j = i + xcc_id * adev->gfx.num_compute_rings; +for (i =0 ; i < adev->gfx.num_compute_rings; i++) kiq->pmf->kiq_unmap_queues (kiq_ring, &adev->gfx.compute_ring[i],RESET_QUEUES ,0 ,0 ); - }if (adev->gfx.kiq[0 ].ring.sched.ready && !adev->job_hang) r =amdgpu_ring_test_helper (kiq_ring);
@@ -526,7 +522,7 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id)struct amdgpu_kiq *kiq = &adev->gfx.kiq[xcc_id];struct amdgpu_ring *kiq_ring = &kiq->ring;uint64_t queue_mask =0 ; -int r, i, j; +int r, i;if (!kiq->pmf || !kiq->pmf->kiq_map_queues || !kiq->pmf->kiq_set_resources)return -EINVAL ;
@@ -562,10 +558,8 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id) queue_mask = ~0ULL ; kiq->pmf->kiq_set_resources (kiq_ring, queue_mask); -for (i =0 ; i < adev->gfx.num_compute_rings; i++) { - j = i + xcc_id * adev->gfx.num_compute_rings; +for (i =0 ; i < adev->gfx.num_compute_rings; i++) kiq->pmf->kiq_map_queues (kiq_ring, &adev->gfx.compute_ring[i]); - } r =amdgpu_ring_test_helper (kiq_ring);spin_unlock (&kiq->ring_lock);
Signature · 1 line
2.27.0