Applied. Thanks!

Alex

On Mon, Sep 21, 2020 at 9:14 AM Liu Shixin liushixin2@huawei.com wrote:

Simplify the return expression.

Signed-off-by: Liu Shixin liushixin2@huawei.com

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index 5c4b74f964fc..3612841d40dc 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -1214,7 +1214,6 @@ static int smu_hw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct smu_context *smu = &adev->smu;

•   int ret = 0;
  
    if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))
            return 0;
  

@@ -1230,11 +1229,7 @@ static int smu_hw_fini(void *handle)

    adev->pm.dpm_enabled = false;

•   ret = smu_smc_hw_cleanup(smu);
  

•   if (ret)
  

•           return ret;
  

•   return 0;
  

•   return smu_smc_hw_cleanup(smu);
  

}

int smu_reset(struct smu_context *smu)

2.25.1

---

amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx