[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CADnq5_P8DDkzHxySARAdOckgwvqnO3J_mL8-kpGD5udqa-t-eA@mail.gmail.com>
Date: Wed, 17 Nov 2021 16:27:06 -0500
From: Alex Deucher <alexdeucher@...il.com>
To: Bernard Zhao <bernard@...o.com>
Cc: Alex Deucher <alexander.deucher@....com>,
Christian König <christian.koenig@....com>,
"Pan, Xinhui" <Xinhui.Pan@....com>,
David Airlie <airlied@...ux.ie>,
Daniel Vetter <daniel@...ll.ch>,
Candice Li <candice.li@....com>, Monk liu <monk.liu@....com>,
John Clements <john.clements@....com>,
Jingwen Chen <Jingwen.Chen2@....com>,
Peng Ju Zhou <PengJu.Zhou@....com>,
Jiawei Gu <Jiawei.Gu@....com>,
Bokun Zhang <bokun.zhang@....com>,
Zhigang Luo <zhigang.luo@....com>,
Lee Jones <lee.jones@...aro.org>,
amd-gfx list <amd-gfx@...ts.freedesktop.org>,
Maling list - DRI developers
<dri-devel@...ts.freedesktop.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2] drm/amd/amdgpu: cleanup the code style a bit
Applied. Thanks!
Alex
On Mon, Nov 15, 2021 at 7:09 AM Bernard Zhao <bernard@...o.com> wrote:
>
> This change is to cleanup the code style a bit.
>
> Signed-off-by: Bernard Zhao <bernard@...o.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 21 +++++++++++++--------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index 04cf9b207e62..3fc49823f527 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -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)
> --
> 2.33.1
>
Powered by blists - more mailing lists