]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
amdgpu/vce3: Cleanup harvest config function.
authorTom St Denis <tom.stdenis@amd.com>
Tue, 15 Dec 2015 15:21:46 +0000 (10:21 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 4 Jan 2016 22:20:04 +0000 (17:20 -0500)
Basic LOC reduction.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c

index 35f48ad7644dc66d15730afc2929fa022c85ee0a..0de86dea4bfa2fb134a3f73d6000f239d307c83d 100644 (file)
@@ -314,14 +314,11 @@ static int vce_v3_0_start(struct amdgpu_device *adev)
 static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev)
 {
        u32 tmp;
-       unsigned ret;
 
        /* Fiji, Stoney are single pipe */
        if ((adev->asic_type == CHIP_FIJI) ||
-           (adev->asic_type == CHIP_STONEY)){
-               ret = AMDGPU_VCE_HARVEST_VCE1;
-               return ret;
-       }
+           (adev->asic_type == CHIP_STONEY))
+               return AMDGPU_VCE_HARVEST_VCE1;
 
        /* Tonga and CZ are dual or single pipe */
        if (adev->flags & AMD_IS_APU)
@@ -335,19 +332,14 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev)
 
        switch (tmp) {
        case 1:
-               ret = AMDGPU_VCE_HARVEST_VCE0;
-               break;
+               return AMDGPU_VCE_HARVEST_VCE0;
        case 2:
-               ret = AMDGPU_VCE_HARVEST_VCE1;
-               break;
+               return AMDGPU_VCE_HARVEST_VCE1;
        case 3:
-               ret = AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1;
-               break;
+               return AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1;
        default:
-               ret = 0;
+               return 0;
        }
-
-       return ret;
 }
 
 static int vce_v3_0_early_init(void *handle)