Subject: Re: [PATCH] drm/amd/amdgpu: cleanup the code style a bit
To:     Bernard Zhao <bernard@vivo.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Jingwen Chen <Jingwen.Chen2@amd.com>,
        Candice Li <candice.li@amd.com>,
        John Clements <john.clements@amd.com>,
        Monk liu <monk.liu@amd.com>,
        Peng Ju Zhou <PengJu.Zhou@amd.com>,
        Jiawei Gu <Jiawei.Gu@amd.com>,
        Bokun Zhang <bokun.zhang@amd.com>,
        Zhigang Luo <zhigang.luo@amd.com>,
        Lee Jones <lee.jones@linaro.org>,
        amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
References: <20211115070714.7007-1-bernard@vivo.com>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <ckoenig.leichtzumerken@gmail.com>
Message-ID: <ebcf8b30-7311-9d77-07ab-1b92756c0ae0@gmail.com>
Date:   Mon, 15 Nov 2021 12:49:02 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.13.0
MIME-Version: 1.0
In-Reply-To: <20211115070714.7007-1-bernard@vivo.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
Precedence: bulk

Am 15.11.21 um 08:07 schrieb Bernard Zhao:
> This change is to cleanup the code style a bit.

To be honest I think the old style looked better. It took me a moment to 
validate this now.

What you could to instead is to have goto style error handling which 
would make this a bit more cleaner I think.

Christian.

>
> Signed-off-by: Bernard Zhao <bernard@vivo.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index 04cf9b207e62..90070b41136a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -286,12 +286,14 @@ static int amdgpu_virt_init_ras_err_handler_data(struct amdgpu_device *adev)
>   		return -ENOMEM;
>   
>   	bps = kmalloc_array(align_space, sizeof((*data)->bps), GFP_KERNEL);
> +	if (!bps) {
> +		kfree(*data);
> +		return -ENOMEM;
> +	}
>   	bps_bo = kmalloc_array(align_space, sizeof((*data)->bps_bo), GFP_KERNEL);
> -
> -	if (!bps || !bps_bo) {
> -		kfree(bps);
> -		kfree(bps_bo);
> +	if (!bps_bo) {
>   		kfree(*data);
> +		kfree(bps);
>   		return -ENOMEM;
>   	}
>