From: "Christian König" <christian.koenig@amd.com>
To: 1587180037-113840-1-git-send-email-bernard@vivo.com,
Felix Kuehling <Felix.Kuehling@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
"David (ChunMing) Zhou" <David1.Zhou@amd.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Cc: opensource.kernel@vivo.com, Bernard Zhao <bernard@vivo.com>
Subject: Re: [PATCH V3] amdgpu: remove unnecessary condition check
Date: Tue, 21 Apr 2020 10:06:03 +0200 [thread overview]
Message-ID: <4c027bd0-c2ff-b587-6389-62a3d25dec1b@amd.com> (raw)
In-Reply-To: <20200421080324.130104-1-bernard@vivo.com>
Am 21.04.20 um 10:03 schrieb Bernard Zhao:
> There is no need to if check again, maybe we could merge
> into the above else branch.
>
> Signed-off-by: Bernard Zhao <bernard@vivo.com>
>
> Changes since V1:
> *commit message improve
> *code style refactoring
>
> Changes since V2:
> *code style adjust
>
> Link for V1:
> *https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fpatchwork%2Fpatch%2F1226587%2F&data=02%7C01%7Cchristian.koenig%40amd.com%7C0b8fffafb715474289b208d7e5ca7f6c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637230530201280350&sdata=Sewv5ESX%2B0B4DbFbE03uM5sifrEcmJllC8pt7J42I7M%3D&reserved=0
> ---
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 +++++++-----------
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index 9dff792c9290..5424bd921a7b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -660,13 +660,12 @@ static int reserve_bo_and_vm(struct kgd_mem *mem,
>
> ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list,
> false, &ctx->duplicates);
> - if (!ret)
> - ctx->reserved = true;
> - else {
> - pr_err("Failed to reserve buffers in ttm\n");
> + if (ret) {
> + pr_err("Failed to reserve buffers in ttm.\n");
> kfree(ctx->vm_pd);
> ctx->vm_pd = NULL;
> - }
> + } else
> + ctx->reserved = true;
That is still not correct coding style. In general when one branch of an
if/else uses {} the other one should use it as well.
But I agree with Felix that this change looks rather superfluous to me
as well.
Regards,
Christian.
>
> return ret;
> }
> @@ -733,15 +732,12 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem,
>
> ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list,
> false, &ctx->duplicates);
> - if (!ret)
> - ctx->reserved = true;
> - else
> - pr_err("Failed to reserve buffers in ttm.\n");
> -
> if (ret) {
> + pr_err("Failed to reserve buffers in ttm.\n");
> kfree(ctx->vm_pd);
> ctx->vm_pd = NULL;
> - }
> + } else
> + ctx->reserved = true;
>
> return ret;
> }
next prev parent reply other threads:[~2020-04-21 8:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 8:03 [PATCH V3] amdgpu: remove unnecessary condition check Bernard Zhao
2020-04-21 8:06 ` Christian König [this message]
2020-04-21 8:44 ` 赵军奎
2020-04-21 9:34 ` [V3] " Markus Elfring
2020-04-21 9:48 ` [PATCH V3] " Christian König
2020-04-21 10:00 ` [V3] " Markus Elfring
2020-04-21 11:12 ` Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4c027bd0-c2ff-b587-6389-62a3d25dec1b@amd.com \
--to=christian.koenig@amd.com \
--cc=1587180037-113840-1-git-send-email-bernard@vivo.com \
--cc=David1.Zhou@amd.com \
--cc=Felix.Kuehling@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=bernard@vivo.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=opensource.kernel@vivo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).