]> www.infradead.org Git - users/willy/xarray.git/commitdiff
drm/amd/amdgpu: cleanup the code style a bit
authorBernard Zhao <bernard@vivo.com>
Mon, 15 Nov 2021 12:09:06 +0000 (04:09 -0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 22 Nov 2021 19:45:02 +0000 (14:45 -0500)
This change is to cleanup the code style a bit.

Signed-off-by: Bernard Zhao <bernard@vivo.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c

index 04cf9b207e628cd9bb93a75e68fa4f69ba17beb7..3fc49823f52766bc49dd455ac4d3a75a9595c9a6 100644 (file)
@@ -283,17 +283,15 @@ static int amdgpu_virt_init_ras_err_handler_data(struct amdgpu_device *adev)
 
        *data = kmalloc(sizeof(struct amdgpu_virt_ras_err_handler_data), GFP_KERNEL);
        if (!*data)
-               return -ENOMEM;
+               goto data_failure;
 
        bps = kmalloc_array(align_space, sizeof((*data)->bps), GFP_KERNEL);
-       bps_bo = kmalloc_array(align_space, sizeof((*data)->bps_bo), GFP_KERNEL);
+       if (!bps)
+               goto bps_failure;
 
-       if (!bps || !bps_bo) {
-               kfree(bps);
-               kfree(bps_bo);
-               kfree(*data);
-               return -ENOMEM;
-       }
+       bps_bo = kmalloc_array(align_space, sizeof((*data)->bps_bo), GFP_KERNEL);
+       if (!bps_bo)
+               goto bps_bo_failure;
 
        (*data)->bps = bps;
        (*data)->bps_bo = bps_bo;
@@ -303,6 +301,13 @@ static int amdgpu_virt_init_ras_err_handler_data(struct amdgpu_device *adev)
        virt->ras_init_done = true;
 
        return 0;
+
+bps_bo_failure:
+       kfree(bps);
+bps_failure:
+       kfree(*data);
+data_failure:
+       return -ENOMEM;
 }
 
 static void amdgpu_virt_ras_release_bp(struct amdgpu_device *adev)