drm/amdgpu/pm: smu_v13_0_4: delete duplicate condition
PATCH 1/1 drm/amdgpu/pm: smu_v13_0_4: delete duplicate condition
There is no need to check if "clock_ranges' is non-NULL. It is checked already on the line before.
Signed-off-by Dan Carpenter <[email protected]>
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 62 +++++++++---------- 1 file changed, 30 insertions(+), 32 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +30 -32
@@ -644,42 +644,40 @@ static int smu_v13_0_4_set_watermarks_table(struct smu_context *smu,if (!table || !clock_ranges)return -EINVAL ; -if (clock_ranges) { -if (clock_ranges->num_reader_wm_sets >NUM_WM_RANGES || - clock_ranges->num_writer_wm_sets >NUM_WM_RANGES ) -return -EINVAL ; - -for (i =0 ; i < clock_ranges->num_reader_wm_sets; i++) { - table->WatermarkRow[WM_DCFCLK ][i].MinClock = - clock_ranges->reader_wm_sets[i].min_drain_clk_mhz; - table->WatermarkRow[WM_DCFCLK ][i].MaxClock = - clock_ranges->reader_wm_sets[i].max_drain_clk_mhz; - table->WatermarkRow[WM_DCFCLK ][i].MinMclk = - clock_ranges->reader_wm_sets[i].min_fill_clk_mhz; - table->WatermarkRow[WM_DCFCLK ][i].MaxMclk = - clock_ranges->reader_wm_sets[i].max_fill_clk_mhz; - - table->WatermarkRow[WM_DCFCLK ][i].WmSetting = - clock_ranges->reader_wm_sets[i].wm_inst; - } +if (clock_ranges->num_reader_wm_sets >NUM_WM_RANGES || + clock_ranges->num_writer_wm_sets >NUM_WM_RANGES ) +return -EINVAL ; -for (i =0 ; i < clock_ranges->num_writer_wm_sets; i++) { - table->WatermarkRow[WM_SOCCLK ][i].MinClock = - clock_ranges->writer_wm_sets[i].min_fill_clk_mhz; - table->WatermarkRow[WM_SOCCLK ][i].MaxClock = - clock_ranges->writer_wm_sets[i].max_fill_clk_mhz; - table->WatermarkRow[WM_SOCCLK ][i].MinMclk = - clock_ranges->writer_wm_sets[i].min_drain_clk_mhz; - table->WatermarkRow[WM_SOCCLK ][i].MaxMclk = - clock_ranges->writer_wm_sets[i].max_drain_clk_mhz; - - table->WatermarkRow[WM_SOCCLK ][i].WmSetting = - clock_ranges->writer_wm_sets[i].wm_inst; - } +for (i =0 ; i < clock_ranges->num_reader_wm_sets; i++) { + table->WatermarkRow[WM_DCFCLK ][i].MinClock = + clock_ranges->reader_wm_sets[i].min_drain_clk_mhz; + table->WatermarkRow[WM_DCFCLK ][i].MaxClock = + clock_ranges->reader_wm_sets[i].max_drain_clk_mhz; + table->WatermarkRow[WM_DCFCLK ][i].MinMclk = + clock_ranges->reader_wm_sets[i].min_fill_clk_mhz; + table->WatermarkRow[WM_DCFCLK ][i].MaxMclk = + clock_ranges->reader_wm_sets[i].max_fill_clk_mhz; + + table->WatermarkRow[WM_DCFCLK ][i].WmSetting = + clock_ranges->reader_wm_sets[i].wm_inst; + } - smu->watermarks_bitmap |=WATERMARKS_EXIST ; +for (i =0 ; i < clock_ranges->num_writer_wm_sets; i++) { + table->WatermarkRow[WM_SOCCLK ][i].MinClock = + clock_ranges->writer_wm_sets[i].min_fill_clk_mhz; + table->WatermarkRow[WM_SOCCLK ][i].MaxClock = + clock_ranges->writer_wm_sets[i].max_fill_clk_mhz; + table->WatermarkRow[WM_SOCCLK ][i].MinMclk = + clock_ranges->writer_wm_sets[i].min_drain_clk_mhz; + table->WatermarkRow[WM_SOCCLK ][i].MaxMclk = + clock_ranges->writer_wm_sets[i].max_drain_clk_mhz; + + table->WatermarkRow[WM_SOCCLK ][i].WmSetting = + clock_ranges->writer_wm_sets[i].wm_inst; } + smu->watermarks_bitmap |=WATERMARKS_EXIST ; +/* pass data to smu controller */ if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) && !(smu->watermarks_bitmap &WATERMARKS_LOADED )) {
Signature · 1 line
2.35.1
Alex Deucher
AppliedApplied. Thanks!
Alex
Quoted 89 lines · Dan Carpenter
There is no need to check if "
clock_ranges' is non-NULL. It is checked already on the line before.Signed-off-by Dan Carpenter <[email protected]>--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 62 +++++++++---------- 1 file changed, 30 insertions(+), 32 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +30
-33@@ -644,42 +644,40 @@ static int smu_v13_0_4_set_watermarks_table(struct smu_context *smu,if (!table || !clock_ranges)return -EINVAL ; -if (clock_ranges) { -if (clock_ranges->num_reader_wm_sets >NUM_WM_RANGES || - clock_ranges->num_writer_wm_sets >NUM_WM_RANGES ) -return -EINVAL ; - -for (i =0 ; i < clock_ranges->num_reader_wm_sets; i++) { - table->WatermarkRow[WM_DCFCLK ][i].MinClock = - clock_ranges->reader_wm_sets[i].min_drain_clk_mhz; - table->WatermarkRow[WM_DCFCLK ][i].MaxClock = - clock_ranges->reader_wm_sets[i].max_drain_clk_mhz; - table->WatermarkRow[WM_DCFCLK ][i].MinMclk = - clock_ranges->reader_wm_sets[i].min_fill_clk_mhz; - table->WatermarkRow[WM_DCFCLK ][i].MaxMclk = - clock_ranges->reader_wm_sets[i].max_fill_clk_mhz; - - table->WatermarkRow[WM_DCFCLK ][i].WmSetting = - clock_ranges->reader_wm_sets[i].wm_inst; - } +if (clock_ranges->num_reader_wm_sets >NUM_WM_RANGES || + clock_ranges->num_writer_wm_sets >NUM_WM_RANGES ) +return -EINVAL ; -for (i =0 ; i < clock_ranges->num_writer_wm_sets; i++) { - table->WatermarkRow[WM_SOCCLK ][i].MinClock = - clock_ranges->writer_wm_sets[i].min_fill_clk_mhz; - table->WatermarkRow[WM_SOCCLK ][i].MaxClock = - clock_ranges->writer_wm_sets[i].max_fill_clk_mhz; - table->WatermarkRow[WM_SOCCLK ][i].MinMclk = - clock_ranges->writer_wm_sets[i].min_drain_clk_mhz; - table->WatermarkRow[WM_SOCCLK ][i].MaxMclk = - clock_ranges->writer_wm_sets[i].max_drain_clk_mhz; - - table->WatermarkRow[WM_SOCCLK ][i].WmSetting = - clock_ranges->writer_wm_sets[i].wm_inst; - } +for (i =0 ; i < clock_ranges->num_reader_wm_sets; i++) { + table->WatermarkRow[WM_DCFCLK ][i].MinClock = + clock_ranges->reader_wm_sets[i].min_drain_clk_mhz; + table->WatermarkRow[WM_DCFCLK ][i].MaxClock = + clock_ranges->reader_wm_sets[i].max_drain_clk_mhz; + table->WatermarkRow[WM_DCFCLK ][i].MinMclk = + clock_ranges->reader_wm_sets[i].min_fill_clk_mhz; + table->WatermarkRow[WM_DCFCLK ][i].MaxMclk = + clock_ranges->reader_wm_sets[i].max_fill_clk_mhz; + + table->WatermarkRow[WM_DCFCLK ][i].WmSetting = + clock_ranges->reader_wm_sets[i].wm_inst; + } - smu->watermarks_bitmap |=WATERMARKS_EXIST ; +for (i =0 ; i < clock_ranges->num_writer_wm_sets; i++) { + table->WatermarkRow[WM_SOCCLK ][i].MinClock = + clock_ranges->writer_wm_sets[i].min_fill_clk_mhz; + table->WatermarkRow[WM_SOCCLK ][i].MaxClock = + clock_ranges->writer_wm_sets[i].max_fill_clk_mhz; + table->WatermarkRow[WM_SOCCLK ][i].MinMclk = + clock_ranges->writer_wm_sets[i].min_drain_clk_mhz; + table->WatermarkRow[WM_SOCCLK ][i].MaxMclk = + clock_ranges->writer_wm_sets[i].max_drain_clk_mhz; + + table->WatermarkRow[WM_SOCCLK ][i].WmSetting = + clock_ranges->writer_wm_sets[i].wm_inst; } + smu->watermarks_bitmap |=WATERMARKS_EXIST ; +/* pass data to smu controller */ if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) && !(smu->watermarks_bitmap &WATERMARKS_LOADED )) { --2.35.1