* [PATCH] drm/amd/pm: fix error handling
@ 2022-02-05 15:00 trix
2022-02-07 3:04 ` Quan, Evan
0 siblings, 1 reply; 3+ messages in thread
From: trix @ 2022-02-05 15:00 UTC (permalink / raw)
To: evan.quan, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel, nathan, ndesaulniers, lijo.lazar, darren.powell,
guchun.chen, andrey.grodzovsky
Cc: amd-gfx, dri-devel, linux-kernel, llvm, Tom Rix
From: Tom Rix <trix@redhat.com>
clang static analysis reports this error
amdgpu_smu.c:2289:9: warning: Called function pointer
is null (null dereference)
return smu->ppt_funcs->emit_clk_levels(
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
There is a logic error in the earlier check of
emit_clk_levels. The error value is set to
the ret variable but ret is never used. Return
directly and remove the unneeded ret variable.
Fixes: 5d64f9bbb628 ("amdgpu/pm: Implement new API function "emit" that accepts buffer base and write offset")
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index af368aa1fd0ae..5f3b3745a9b7a 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -2274,7 +2274,6 @@ static int smu_emit_ppclk_levels(void *handle, enum pp_clock_type type, char *bu
{
struct smu_context *smu = handle;
enum smu_clk_type clk_type;
- int ret = 0;
clk_type = smu_convert_to_smuclk(type);
if (clk_type == SMU_CLK_COUNT)
@@ -2284,7 +2283,7 @@ static int smu_emit_ppclk_levels(void *handle, enum pp_clock_type type, char *bu
return -EOPNOTSUPP;
if (!smu->ppt_funcs->emit_clk_levels)
- ret = -ENOENT;
+ return -ENOENT;
return smu->ppt_funcs->emit_clk_levels(smu, clk_type, buf, offset);
--
2.26.3
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH] drm/amd/pm: fix error handling 2022-02-05 15:00 [PATCH] drm/amd/pm: fix error handling trix @ 2022-02-07 3:04 ` Quan, Evan 2022-02-07 21:15 ` Alex Deucher 0 siblings, 1 reply; 3+ messages in thread From: Quan, Evan @ 2022-02-07 3:04 UTC (permalink / raw) To: trix, Deucher, Alexander, Koenig, Christian, Pan, Xinhui, airlied, daniel, nathan, ndesaulniers, Lazar, Lijo, Powell, Darren, Chen, Guchun, Grodzovsky, Andrey Cc: amd-gfx, dri-devel, linux-kernel, llvm [AMD Official Use Only] Reviewed-by: Evan Quan <evan.quan@amd.com> > -----Original Message----- > From: trix@redhat.com <trix@redhat.com> > Sent: Saturday, February 5, 2022 11:00 PM > To: Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander > <Alexander.Deucher@amd.com>; Koenig, Christian > <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; > airlied@linux.ie; daniel@ffwll.ch; nathan@kernel.org; > ndesaulniers@google.com; Lazar, Lijo <Lijo.Lazar@amd.com>; Powell, Darren > <Darren.Powell@amd.com>; Chen, Guchun <Guchun.Chen@amd.com>; > Grodzovsky, Andrey <Andrey.Grodzovsky@amd.com> > Cc: amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux- > kernel@vger.kernel.org; llvm@lists.linux.dev; Tom Rix <trix@redhat.com> > Subject: [PATCH] drm/amd/pm: fix error handling > > From: Tom Rix <trix@redhat.com> > > clang static analysis reports this error > amdgpu_smu.c:2289:9: warning: Called function pointer > is null (null dereference) > return smu->ppt_funcs->emit_clk_levels( > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > There is a logic error in the earlier check of > emit_clk_levels. The error value is set to > the ret variable but ret is never used. Return > directly and remove the unneeded ret variable. > > Fixes: 5d64f9bbb628 ("amdgpu/pm: Implement new API function "emit" that > accepts buffer base and write offset") > Signed-off-by: Tom Rix <trix@redhat.com> > --- > drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > index af368aa1fd0ae..5f3b3745a9b7a 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > @@ -2274,7 +2274,6 @@ static int smu_emit_ppclk_levels(void *handle, > enum pp_clock_type type, char *bu > { > struct smu_context *smu = handle; > enum smu_clk_type clk_type; > - int ret = 0; > > clk_type = smu_convert_to_smuclk(type); > if (clk_type == SMU_CLK_COUNT) > @@ -2284,7 +2283,7 @@ static int smu_emit_ppclk_levels(void *handle, > enum pp_clock_type type, char *bu > return -EOPNOTSUPP; > > if (!smu->ppt_funcs->emit_clk_levels) > - ret = -ENOENT; > + return -ENOENT; > > return smu->ppt_funcs->emit_clk_levels(smu, clk_type, buf, offset); > > -- > 2.26.3 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amd/pm: fix error handling 2022-02-07 3:04 ` Quan, Evan @ 2022-02-07 21:15 ` Alex Deucher 0 siblings, 0 replies; 3+ messages in thread From: Alex Deucher @ 2022-02-07 21:15 UTC (permalink / raw) To: Quan, Evan Cc: trix, Deucher, Alexander, Koenig, Christian, Pan, Xinhui, airlied, daniel, nathan, ndesaulniers, Lazar, Lijo, Powell, Darren, Chen, Guchun, Grodzovsky, Andrey, llvm, dri-devel, amd-gfx, linux-kernel Applied. Thanks! Alex On Sun, Feb 6, 2022 at 10:04 PM Quan, Evan <Evan.Quan@amd.com> wrote: > > [AMD Official Use Only] > > Reviewed-by: Evan Quan <evan.quan@amd.com> > > > -----Original Message----- > > From: trix@redhat.com <trix@redhat.com> > > Sent: Saturday, February 5, 2022 11:00 PM > > To: Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander > > <Alexander.Deucher@amd.com>; Koenig, Christian > > <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; > > airlied@linux.ie; daniel@ffwll.ch; nathan@kernel.org; > > ndesaulniers@google.com; Lazar, Lijo <Lijo.Lazar@amd.com>; Powell, Darren > > <Darren.Powell@amd.com>; Chen, Guchun <Guchun.Chen@amd.com>; > > Grodzovsky, Andrey <Andrey.Grodzovsky@amd.com> > > Cc: amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux- > > kernel@vger.kernel.org; llvm@lists.linux.dev; Tom Rix <trix@redhat.com> > > Subject: [PATCH] drm/amd/pm: fix error handling > > > > From: Tom Rix <trix@redhat.com> > > > > clang static analysis reports this error > > amdgpu_smu.c:2289:9: warning: Called function pointer > > is null (null dereference) > > return smu->ppt_funcs->emit_clk_levels( > > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > There is a logic error in the earlier check of > > emit_clk_levels. The error value is set to > > the ret variable but ret is never used. Return > > directly and remove the unneeded ret variable. > > > > Fixes: 5d64f9bbb628 ("amdgpu/pm: Implement new API function "emit" that > > accepts buffer base and write offset") > > Signed-off-by: Tom Rix <trix@redhat.com> > > --- > > drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > > b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > > index af368aa1fd0ae..5f3b3745a9b7a 100644 > > --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > > +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > > @@ -2274,7 +2274,6 @@ static int smu_emit_ppclk_levels(void *handle, > > enum pp_clock_type type, char *bu > > { > > struct smu_context *smu = handle; > > enum smu_clk_type clk_type; > > - int ret = 0; > > > > clk_type = smu_convert_to_smuclk(type); > > if (clk_type == SMU_CLK_COUNT) > > @@ -2284,7 +2283,7 @@ static int smu_emit_ppclk_levels(void *handle, > > enum pp_clock_type type, char *bu > > return -EOPNOTSUPP; > > > > if (!smu->ppt_funcs->emit_clk_levels) > > - ret = -ENOENT; > > + return -ENOENT; > > > > return smu->ppt_funcs->emit_clk_levels(smu, clk_type, buf, offset); > > > > -- > > 2.26.3 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-07 21:16 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-02-05 15:00 [PATCH] drm/amd/pm: fix error handling trix 2022-02-07 3:04 ` Quan, Evan 2022-02-07 21:15 ` Alex Deucher
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®