Skip to contentSkip to conversation

drm/amd/pm: remove useless if

PATCH Applied Jiapeng Chong 2 participants 2 messages Jan 21, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/pm: remove useless if

Clean the following coccicheck warning:

./drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c:7035:2-4: WARNING: possible condition with no effect (if == else).

---
 drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +1 -4
index 23ff0d812e4b..7427c50409d4 100644
@@ -7032,10 +7032,7 @@ static int si_power_control_set_level(struct amdgpu_device *adev)
 	ret = si_resume_smc(adev);
 	if (ret)
 		return ret;
-	ret = si_set_sw_state(adev);
-	if (ret)
-		return ret;
-	return 0;
+	return si_set_sw_state(adev);
 }
 
 static void si_set_vce_clock(struct amdgpu_device *adev,
Signature · 1 line
2.20.1.7.g153144c
Applied
#1 lore raw

Applied. Thanks!

Alex

Quoted 31 lines · Jiapeng Chong

Clean the following coccicheck warning:

./drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c:7035:2-4: WARNING: possible condition with no effect (if == else).

---
 drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +1 -5
index 23ff0d812e4b..7427c50409d4 100644
@@ -7032,10 +7032,7 @@ static int si_power_control_set_level(struct amdgpu_device *adev)
        ret = si_resume_smc(adev);
        if (ret)
                return ret;
-       ret = si_set_sw_state(adev);
-       if (ret)
-               return ret;
-       return 0;
+       return si_set_sw_state(adev);
 }
 
 static void si_set_vce_clock(struct amdgpu_device *adev,
--

2.20.1.7.g153144c