From: Tom Rix <[email protected]>
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 <[email protected]>
---
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
Applied. Thanks!
Alex
On Sun, Feb 6, 2022 at 10:04 PM Quan, Evan <[email protected]> wrote:
>
> [AMD Official Use Only]
>
> Reviewed-by: Evan Quan <[email protected]>
>
> > -----Original Message-----
> > From: [email protected] <[email protected]>
> > Sent: Saturday, February 5, 2022 11:00 PM
> > To: Quan, Evan <[email protected]>; Deucher, Alexander
> > <[email protected]>; Koenig, Christian
> > <[email protected]>; Pan, Xinhui <[email protected]>;
> > [email protected]; [email protected]; [email protected];
> > [email protected]; Lazar, Lijo <[email protected]>; Powell, Darren
> > <[email protected]>; Chen, Guchun <[email protected]>;
> > Grodzovsky, Andrey <[email protected]>
> > Cc: [email protected]; [email protected]; linux-
> > [email protected]; [email protected]; Tom Rix <[email protected]>
> > Subject: [PATCH] drm/amd/pm: fix error handling
> >
> > From: Tom Rix <[email protected]>
> >
> > 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 <[email protected]>
> > ---
> > 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
[AMD Official Use Only]
Reviewed-by: Evan Quan <[email protected]>
> -----Original Message-----
> From: [email protected] <[email protected]>
> Sent: Saturday, February 5, 2022 11:00 PM
> To: Quan, Evan <[email protected]>; Deucher, Alexander
> <[email protected]>; Koenig, Christian
> <[email protected]>; Pan, Xinhui <[email protected]>;
> [email protected]; [email protected]; [email protected];
> [email protected]; Lazar, Lijo <[email protected]>; Powell, Darren
> <[email protected]>; Chen, Guchun <[email protected]>;
> Grodzovsky, Andrey <[email protected]>
> Cc: [email protected]; [email protected]; linux-
> [email protected]; [email protected]; Tom Rix <[email protected]>
> Subject: [PATCH] drm/amd/pm: fix error handling
>
> From: Tom Rix <[email protected]>
>
> 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 <[email protected]>
> ---
> 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