Skip to contentSkip to conversation

drm/amd/display: remove unused matching_stream_ptrs variable

PATCH Applied Tom Rix 3 participants 4 messages Mar 25, 2023 – Apr 10, 2023

Subsystems (3)
lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 drm/amd/display: remove unused matching_stream_ptrs variable

clang with W=1 reports drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_enc_cfg.c:625:6: error:
variable 'matching_stream_ptrs' set but not used [-Werror,-Wunused-but-set-variable]

        int matching_stream_ptrs = 0;
            ^

This variable is not used so remove it.

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c +1 -4
index 41198c729d90..30c0644d4418 100644
@@ -622,7 +622,6 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state)
 	int i, j;
 	uint8_t valid_count = 0;
 	uint8_t dig_stream_count = 0;
-	int matching_stream_ptrs = 0;
 	int eng_ids_per_ep_id[MAX_PIPES] = {0};
 	int ep_ids_per_eng_id[MAX_PIPES] = {0};
 	int valid_bitmap = 0;
@@ -645,9 +644,7 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state)
 		struct link_enc_assignment assignment = state->res_ctx.link_enc_cfg_ctx.link_enc_assignments[i];
 
 		if (assignment.valid) {
-			if (assignment.stream == state->streams[i])
-				matching_stream_ptrs++;
-			else
+			if (assignment.stream != state->streams[i])
 				valid_stream_ptrs = false;
 		}
 	}
Signature · 1 line
2.27.0
#1 lore raw

Jimmy, can you review?

The change LGTM; but I'm not sure if there was something else intended here.

Quoted 39 lines · Tom Rix

clang with W=1 reports drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_enc_cfg.c:625:6: error:
variable 'matching_stream_ptrs' set but not used [-Werror,-Wunused-but-set-variable]

        int matching_stream_ptrs = 0;
            ^

This variable is not used so remove it.

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c +1 -5
index 41198c729d90..30c0644d4418 100644
@@ -622,7 +622,6 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state)
        int i, j;
        uint8_t valid_count = 0;
        uint8_t dig_stream_count = 0;
-       int matching_stream_ptrs = 0;
        int eng_ids_per_ep_id[MAX_PIPES] = {0};
        int ep_ids_per_eng_id[MAX_PIPES] = {0};
        int valid_bitmap = 0;
@@ -645,9 +644,7 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state)
                struct link_enc_assignment assignment = state->res_ctx.link_enc_cfg_ctx.link_enc_assignments[i];
 
                if (assignment.valid) {
-                       if (assignment.stream == state->streams[i])
-                               matching_stream_ptrs++;
-                       else
+                       if (assignment.stream != state->streams[i])
                                valid_stream_ptrs = false;
                }
        }
--

2.27.0

Signature · 2 lines
Thanks,
~Nick Desaulniers
Reviewed-by
#2 lore raw
Quoted 4 lines · Nick Desaulniers

Jimmy, can you review?

The change LGTM; but I'm not sure if there was something else intended here.

Nevermind, Jimmy's email address bounced.

Quoted 46 lines · Tom Rix
Quoted 37 lines

clang with W=1 reports drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_enc_cfg.c:625:6: error:
variable 'matching_stream_ptrs' set but not used [-Werror,-Wunused-but-set-variable]

        int matching_stream_ptrs = 0;
            ^

This variable is not used so remove it.

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c +1 -5
index 41198c729d90..30c0644d4418 100644
@@ -622,7 +622,6 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state)
        int i, j;
        uint8_t valid_count = 0;
        uint8_t dig_stream_count = 0;
-       int matching_stream_ptrs = 0;
        int eng_ids_per_ep_id[MAX_PIPES] = {0};
        int ep_ids_per_eng_id[MAX_PIPES] = {0};
        int valid_bitmap = 0;
@@ -645,9 +644,7 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state)
                struct link_enc_assignment assignment = state->res_ctx.link_enc_cfg_ctx.link_enc_assignments[i];
 
                if (assignment.valid) {
-                       if (assignment.stream == state->streams[i])
-                               matching_stream_ptrs++;
-                       else
+                       if (assignment.stream != state->streams[i])
                                valid_stream_ptrs = false;
                }
        }
--
Quoted 2 lines

2.27.0

--
Thanks,
~Nick Desaulniers

Signature · 2 lines
Thanks,
~Nick Desaulniers
#3 lore raw
In reply to Tom Rix
Quoted 8 lines · Tom Rix

clang with W=1 reports drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_enc_cfg.c:625:6: error:

   variable 'matching_stream_ptrs' set but not used [-Werror,-Wunused-but-set-variable]
         int matching_stream_ptrs = 0;
             ^

This variable is not used so remove it.

Applied, thanks!

Quoted 27 lines
---
  drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c +1 -4
index 41198c729d90..30c0644d4418 100644
@@ -622,7 +622,6 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state)
  	int i, j;
  	uint8_t valid_count = 0;
  	uint8_t dig_stream_count = 0;
-	int matching_stream_ptrs = 0;
  	int eng_ids_per_ep_id[MAX_PIPES] = {0};
  	int ep_ids_per_eng_id[MAX_PIPES] = {0};
  	int valid_bitmap = 0;
@@ -645,9 +644,7 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state)
  		struct link_enc_assignment assignment = state->res_ctx.link_enc_cfg_ctx.link_enc_assignments[i];
 
  		if (assignment.valid) {
-			if (assignment.stream == state->streams[i])
-				matching_stream_ptrs++;
-			else
+			if (assignment.stream != state->streams[i])
  				valid_stream_ptrs = false;
  		}
  	}
Signature · 1 line
Hamza