2023-04-08 13:48:10

by Tom Rix

Subject: [PATCH] drm/amd/display: set variables dml*_funcs storage-class-specifier to static

smatch reports
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:44:24: warning: symbol
'dml20_funcs' was not declared. Should it be static?
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:51:24: warning: symbol
'dml20v2_funcs' was not declared. Should it be static?
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:58:24: warning: symbol
'dml21_funcs' was not declared. Should it be static?
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:65:24: warning: symbol
'dml30_funcs' was not declared. Should it be static?
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:72:24: warning: symbol
'dml31_funcs' was not declared. Should it be static?
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:79:24: warning: symbol
'dml314_funcs' was not declared. Should it be static?
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:86:24: warning: symbol
'dml32_funcs' was not declared. Should it be static?

These variables are only used in one file so should be static.
Cleanup whitespace, use tabs consistently for indents.

Signed-off-by: Tom Rix <[email protected]>
---
.../drm/amd/display/dc/dml/display_mode_lib.c | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c
index 4125d3d111d1..bdf3ac6cadd5 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c
@@ -41,51 +41,51 @@
#include "dcn32/display_rq_dlg_calc_32.h"
#include "dml_logger.h"

-const struct dml_funcs dml20_funcs = {
+static const struct dml_funcs dml20_funcs = {
.validate = dml20_ModeSupportAndSystemConfigurationFull,
.recalculate = dml20_recalculate,
.rq_dlg_get_dlg_reg = dml20_rq_dlg_get_dlg_reg,
.rq_dlg_get_rq_reg = dml20_rq_dlg_get_rq_reg
};

-const struct dml_funcs dml20v2_funcs = {
+static const struct dml_funcs dml20v2_funcs = {
.validate = dml20v2_ModeSupportAndSystemConfigurationFull,
.recalculate = dml20v2_recalculate,
.rq_dlg_get_dlg_reg = dml20v2_rq_dlg_get_dlg_reg,
.rq_dlg_get_rq_reg = dml20v2_rq_dlg_get_rq_reg
};

-const struct dml_funcs dml21_funcs = {
- .validate = dml21_ModeSupportAndSystemConfigurationFull,
- .recalculate = dml21_recalculate,
- .rq_dlg_get_dlg_reg = dml21_rq_dlg_get_dlg_reg,
- .rq_dlg_get_rq_reg = dml21_rq_dlg_get_rq_reg
+static const struct dml_funcs dml21_funcs = {
+ .validate = dml21_ModeSupportAndSystemConfigurationFull,
+ .recalculate = dml21_recalculate,
+ .rq_dlg_get_dlg_reg = dml21_rq_dlg_get_dlg_reg,
+ .rq_dlg_get_rq_reg = dml21_rq_dlg_get_rq_reg
};

-const struct dml_funcs dml30_funcs = {
+static const struct dml_funcs dml30_funcs = {
.validate = dml30_ModeSupportAndSystemConfigurationFull,
.recalculate = dml30_recalculate,
.rq_dlg_get_dlg_reg = dml30_rq_dlg_get_dlg_reg,
.rq_dlg_get_rq_reg = dml30_rq_dlg_get_rq_reg
};

-const struct dml_funcs dml31_funcs = {
+static const struct dml_funcs dml31_funcs = {
.validate = dml31_ModeSupportAndSystemConfigurationFull,
.recalculate = dml31_recalculate,
.rq_dlg_get_dlg_reg = dml31_rq_dlg_get_dlg_reg,
.rq_dlg_get_rq_reg = dml31_rq_dlg_get_rq_reg
};

-const struct dml_funcs dml314_funcs = {
+static const struct dml_funcs dml314_funcs = {
.validate = dml314_ModeSupportAndSystemConfigurationFull,
.recalculate = dml314_recalculate,
.rq_dlg_get_dlg_reg = dml314_rq_dlg_get_dlg_reg,
.rq_dlg_get_rq_reg = dml314_rq_dlg_get_rq_reg
};

-const struct dml_funcs dml32_funcs = {
+static const struct dml_funcs dml32_funcs = {
.validate = dml32_ModeSupportAndSystemConfigurationFull,
- .recalculate = dml32_recalculate,
+ .recalculate = dml32_recalculate,
.rq_dlg_get_dlg_reg_v2 = dml32_rq_dlg_get_dlg_reg,
.rq_dlg_get_rq_reg_v2 = dml32_rq_dlg_get_rq_reg
};
--
2.27.0

2023-04-10 14:52:01

by Hamza Mahfooz

Subject: Re: [PATCH] drm/amd/display: set variables dml*_funcs storage-class-specifier to static

On 4/8/23 09:43, Tom Rix wrote:
> smatch reports
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:44:24: warning: symbol
> 'dml20_funcs' was not declared. Should it be static?
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:51:24: warning: symbol
> 'dml20v2_funcs' was not declared. Should it be static?
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:58:24: warning: symbol
> 'dml21_funcs' was not declared. Should it be static?
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:65:24: warning: symbol
> 'dml30_funcs' was not declared. Should it be static?
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:72:24: warning: symbol
> 'dml31_funcs' was not declared. Should it be static?
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:79:24: warning: symbol
> 'dml314_funcs' was not declared. Should it be static?
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.c:86:24: warning: symbol
> 'dml32_funcs' was not declared. Should it be static?
>
> These variables are only used in one file so should be static.
> Cleanup whitespace, use tabs consistently for indents.
>
> Signed-off-by: Tom Rix <[email protected]>

Applied, thanks!

> ---
> .../drm/amd/display/dc/dml/display_mode_lib.c | 24 +++++++++----------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c
> index 4125d3d111d1..bdf3ac6cadd5 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c
> @@ -41,51 +41,51 @@
> #include "dcn32/display_rq_dlg_calc_32.h"
> #include "dml_logger.h"
>
> -const struct dml_funcs dml20_funcs = {
> +static const struct dml_funcs dml20_funcs = {
> .validate = dml20_ModeSupportAndSystemConfigurationFull,
> .recalculate = dml20_recalculate,
> .rq_dlg_get_dlg_reg = dml20_rq_dlg_get_dlg_reg,
> .rq_dlg_get_rq_reg = dml20_rq_dlg_get_rq_reg
> };
>
> -const struct dml_funcs dml20v2_funcs = {
> +static const struct dml_funcs dml20v2_funcs = {
> .validate = dml20v2_ModeSupportAndSystemConfigurationFull,
> .recalculate = dml20v2_recalculate,
> .rq_dlg_get_dlg_reg = dml20v2_rq_dlg_get_dlg_reg,
> .rq_dlg_get_rq_reg = dml20v2_rq_dlg_get_rq_reg
> };
>
> -const struct dml_funcs dml21_funcs = {
> - .validate = dml21_ModeSupportAndSystemConfigurationFull,
> - .recalculate = dml21_recalculate,
> - .rq_dlg_get_dlg_reg = dml21_rq_dlg_get_dlg_reg,
> - .rq_dlg_get_rq_reg = dml21_rq_dlg_get_rq_reg
> +static const struct dml_funcs dml21_funcs = {
> + .validate = dml21_ModeSupportAndSystemConfigurationFull,
> + .recalculate = dml21_recalculate,
> + .rq_dlg_get_dlg_reg = dml21_rq_dlg_get_dlg_reg,
> + .rq_dlg_get_rq_reg = dml21_rq_dlg_get_rq_reg
> };
>
> -const struct dml_funcs dml30_funcs = {
> +static const struct dml_funcs dml30_funcs = {
> .validate = dml30_ModeSupportAndSystemConfigurationFull,
> .recalculate = dml30_recalculate,
> .rq_dlg_get_dlg_reg = dml30_rq_dlg_get_dlg_reg,
> .rq_dlg_get_rq_reg = dml30_rq_dlg_get_rq_reg
> };
>
> -const struct dml_funcs dml31_funcs = {
> +static const struct dml_funcs dml31_funcs = {
> .validate = dml31_ModeSupportAndSystemConfigurationFull,
> .recalculate = dml31_recalculate,
> .rq_dlg_get_dlg_reg = dml31_rq_dlg_get_dlg_reg,
> .rq_dlg_get_rq_reg = dml31_rq_dlg_get_rq_reg
> };
>
> -const struct dml_funcs dml314_funcs = {
> +static const struct dml_funcs dml314_funcs = {
> .validate = dml314_ModeSupportAndSystemConfigurationFull,
> .recalculate = dml314_recalculate,
> .rq_dlg_get_dlg_reg = dml314_rq_dlg_get_dlg_reg,
> .rq_dlg_get_rq_reg = dml314_rq_dlg_get_rq_reg
> };
>
> -const struct dml_funcs dml32_funcs = {
> +static const struct dml_funcs dml32_funcs = {
> .validate = dml32_ModeSupportAndSystemConfigurationFull,
> - .recalculate = dml32_recalculate,
> + .recalculate = dml32_recalculate,
> .rq_dlg_get_dlg_reg_v2 = dml32_rq_dlg_get_dlg_reg,
> .rq_dlg_get_rq_reg_v2 = dml32_rq_dlg_get_rq_reg
> };
--
Hamza