drm/amdgpu: fix unused-but-set-variable warnings
Subsystems (3)
PATCH 1/1 drm/amdgpu: fix unused-but-set-variable warnings
GCC reports the following warnings with W=1:
drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c:190:22: warning:
variable 'ring' set but not used [-Wunused-but-set-variable]
190 | struct amdgpu_ring *ring;
| ^~~~drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c:162:22: warning:
variable 'ring' set but not used [-Wunused-but-set-variable]
162 | struct amdgpu_ring *ring;
| ^~~~drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c:383:22: warning:
variable 'ring' set but not used [-Wunused-but-set-variable]
383 | struct amdgpu_ring *ring;
| ^~~~
Those variables are not really used, so remove them to fix the warnings.
--- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 -- drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 3 --- 3 file changed, 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c +0 -2
@@ -187,14 +187,12 @@ static int jpeg_v2_5_hw_init(void *handle)static int jpeg_v2_5_hw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -struct amdgpu_ring *ring;int i;for (i =0 ; i < adev->jpeg.num_jpeg_inst; ++i) {if (adev->jpeg.harvest_config & (1 << i))continue ; - ring = &adev->jpeg.inst[i].ring_dec;if (adev->jpeg.cur_state !=AMD_PG_STATE_GATE &&RREG32_SOC15 (JPEG , i, mmUVD_JRBC_STATUS))jpeg_v2_5_set_powergating_state (adev,AMD_PG_STATE_GATE );
drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c +0 -2
@@ -159,9 +159,7 @@ static int jpeg_v3_0_hw_init(void *handle)static int jpeg_v3_0_hw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -struct amdgpu_ring *ring; - ring = &adev->jpeg.inst->ring_dec;if (adev->jpeg.cur_state !=AMD_PG_STATE_GATE &&RREG32_SOC15 (JPEG ,0 , mmUVD_JRBC_STATUS))jpeg_v3_0_set_powergating_state (adev,AMD_PG_STATE_GATE );
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0 -3
@@ -380,15 +380,12 @@ static int vcn_v3_0_hw_init(void *handle)static int vcn_v3_0_hw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -struct amdgpu_ring *ring;int i;for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) {if (adev->vcn.harvest_config & (1 << i))continue ; - ring = &adev->vcn.inst[i].ring_dec; -if (!amdgpu_sriov_vf (adev)) { if ((adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) || (adev->vcn.cur_state != AMD_PG_STATE_GATE &&
Alex Deucher
AppliedApplied. Thanks!
Quoted 80 lines · Wei Yongjun
GCC reports the following warnings with W=1:
drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c:190:22: warning:
variable 'ring' set but not used [-Wunused-but-set-variable]
190 | structamdgpu_ring*ring;
| ^~~~drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c:162:22: warning:
variable 'ring' set but not used [-Wunused-but-set-variable]
162 | structamdgpu_ring*ring;
| ^~~~drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c:383:22: warning:
variable 'ring' set but not used [-Wunused-but-set-variable]
383 | structamdgpu_ring*ring;
| ^~~~Those variables are not really used, so remove them to fix the warnings.
Reported-by Hulk Robot <[email protected]>Signed-off-by Wei Yongjun <[email protected]>--- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 -- drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 3 --- 3 file changed, 7 deletions(-)drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c +0
-2@@ -187,14 +187,12 @@ static int jpeg_v2_5_hw_init(void *handle)static int jpeg_v2_5_hw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -struct amdgpu_ring *ring;int i;for (i =0 ; i < adev->jpeg.num_jpeg_inst; ++i) {if (adev->jpeg.harvest_config & (1 << i))continue ; - ring = &adev->jpeg.inst[i].ring_dec;if (adev->jpeg.cur_state !=AMD_PG_STATE_GATE &&RREG32_SOC15 (JPEG , i, mmUVD_JRBC_STATUS))jpeg_v2_5_set_powergating_state (adev,AMD_PG_STATE_GATE );drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c +0
-2@@ -159,9 +159,7 @@ static int jpeg_v3_0_hw_init(void *handle)static int jpeg_v3_0_hw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -struct amdgpu_ring *ring; - ring = &adev->jpeg.inst->ring_dec;if (adev->jpeg.cur_state !=AMD_PG_STATE_GATE &&RREG32_SOC15 (JPEG ,0 , mmUVD_JRBC_STATUS))jpeg_v3_0_set_powergating_state (adev,AMD_PG_STATE_GATE );drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-3@@ -380,15 +380,12 @@ static int vcn_v3_0_hw_init(void *handle)static int vcn_v3_0_hw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -struct amdgpu_ring *ring;int i;for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) {if (adev->vcn.harvest_config & (1 << i))continue ; - ring = &adev->vcn.inst[i].ring_dec; -if (!amdgpu_sriov_vf (adev)) { if ((adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) || (adev->vcn.cur_state != AMD_PG_STATE_GATE &&