Commit 82c94233 authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher

drm/amd/display: Remove useless comparison of unsigned int vs. 0

[WHY & HOW]
The comparisons of unsigned int with 0 can have no meanings, i.e.
unsigned int >= 0 (always true) or unsigned int < 0 (always false), and
therefore they are removed.

This fixes 12 NO_EFFECT issues reported by Coverity.
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Acked-by: default avatarZaeem Mohamed <zaeem.mohamed@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 97dc6a48
...@@ -320,16 +320,16 @@ static void rn_dump_clk_registers(struct clk_state_registers_and_bypass *regs_an ...@@ -320,16 +320,16 @@ static void rn_dump_clk_registers(struct clk_state_registers_and_bypass *regs_an
regs_and_bypass->dppclk = internal.CLK1_CLK1_CURRENT_CNT / 10; regs_and_bypass->dppclk = internal.CLK1_CLK1_CURRENT_CNT / 10;
regs_and_bypass->dppclk_bypass = internal.CLK1_CLK1_BYPASS_CNTL & 0x0007; regs_and_bypass->dppclk_bypass = internal.CLK1_CLK1_BYPASS_CNTL & 0x0007;
if (regs_and_bypass->dppclk_bypass < 0 || regs_and_bypass->dppclk_bypass > 4) if (regs_and_bypass->dppclk_bypass > 4)
regs_and_bypass->dppclk_bypass = 0; regs_and_bypass->dppclk_bypass = 0;
regs_and_bypass->dcfclk_bypass = internal.CLK1_CLK3_BYPASS_CNTL & 0x0007; regs_and_bypass->dcfclk_bypass = internal.CLK1_CLK3_BYPASS_CNTL & 0x0007;
if (regs_and_bypass->dcfclk_bypass < 0 || regs_and_bypass->dcfclk_bypass > 4) if (regs_and_bypass->dcfclk_bypass > 4)
regs_and_bypass->dcfclk_bypass = 0; regs_and_bypass->dcfclk_bypass = 0;
regs_and_bypass->dispclk_bypass = internal.CLK1_CLK0_BYPASS_CNTL & 0x0007; regs_and_bypass->dispclk_bypass = internal.CLK1_CLK0_BYPASS_CNTL & 0x0007;
if (regs_and_bypass->dispclk_bypass < 0 || regs_and_bypass->dispclk_bypass > 4) if (regs_and_bypass->dispclk_bypass > 4)
regs_and_bypass->dispclk_bypass = 0; regs_and_bypass->dispclk_bypass = 0;
regs_and_bypass->dprefclk_bypass = internal.CLK1_CLK2_BYPASS_CNTL & 0x0007; regs_and_bypass->dprefclk_bypass = internal.CLK1_CLK2_BYPASS_CNTL & 0x0007;
if (regs_and_bypass->dprefclk_bypass < 0 || regs_and_bypass->dprefclk_bypass > 4) if (regs_and_bypass->dprefclk_bypass > 4)
regs_and_bypass->dprefclk_bypass = 0; regs_and_bypass->dprefclk_bypass = 0;
if (log_info->enabled) { if (log_info->enabled) {
......
...@@ -252,16 +252,16 @@ static void vg_dump_clk_registers(struct clk_state_registers_and_bypass *regs_an ...@@ -252,16 +252,16 @@ static void vg_dump_clk_registers(struct clk_state_registers_and_bypass *regs_an
regs_and_bypass->dppclk = internal.CLK1_CLK1_CURRENT_CNT / 10; regs_and_bypass->dppclk = internal.CLK1_CLK1_CURRENT_CNT / 10;
regs_and_bypass->dppclk_bypass = internal.CLK1_CLK1_BYPASS_CNTL & 0x0007; regs_and_bypass->dppclk_bypass = internal.CLK1_CLK1_BYPASS_CNTL & 0x0007;
if (regs_and_bypass->dppclk_bypass < 0 || regs_and_bypass->dppclk_bypass > 4) if (regs_and_bypass->dppclk_bypass > 4)
regs_and_bypass->dppclk_bypass = 0; regs_and_bypass->dppclk_bypass = 0;
regs_and_bypass->dcfclk_bypass = internal.CLK1_CLK3_BYPASS_CNTL & 0x0007; regs_and_bypass->dcfclk_bypass = internal.CLK1_CLK3_BYPASS_CNTL & 0x0007;
if (regs_and_bypass->dcfclk_bypass < 0 || regs_and_bypass->dcfclk_bypass > 4) if (regs_and_bypass->dcfclk_bypass > 4)
regs_and_bypass->dcfclk_bypass = 0; regs_and_bypass->dcfclk_bypass = 0;
regs_and_bypass->dispclk_bypass = internal.CLK1_CLK0_BYPASS_CNTL & 0x0007; regs_and_bypass->dispclk_bypass = internal.CLK1_CLK0_BYPASS_CNTL & 0x0007;
if (regs_and_bypass->dispclk_bypass < 0 || regs_and_bypass->dispclk_bypass > 4) if (regs_and_bypass->dispclk_bypass > 4)
regs_and_bypass->dispclk_bypass = 0; regs_and_bypass->dispclk_bypass = 0;
regs_and_bypass->dprefclk_bypass = internal.CLK1_CLK2_BYPASS_CNTL & 0x0007; regs_and_bypass->dprefclk_bypass = internal.CLK1_CLK2_BYPASS_CNTL & 0x0007;
if (regs_and_bypass->dprefclk_bypass < 0 || regs_and_bypass->dprefclk_bypass > 4) if (regs_and_bypass->dprefclk_bypass > 4)
regs_and_bypass->dprefclk_bypass = 0; regs_and_bypass->dprefclk_bypass = 0;
if (log_info->enabled) { if (log_info->enabled) {
......
...@@ -642,8 +642,7 @@ static void dce_mi_program_surface_config( ...@@ -642,8 +642,7 @@ static void dce_mi_program_surface_config(
program_tiling(dce_mi, tiling_info); program_tiling(dce_mi, tiling_info);
program_size_and_rotation(dce_mi, rotation, plane_size); program_size_and_rotation(dce_mi, rotation, plane_size);
if (format >= SURFACE_PIXEL_FORMAT_GRPH_BEGIN && if (format < SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
format < SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
program_grph_pixel_format(dce_mi, format); program_grph_pixel_format(dce_mi, format);
} }
...@@ -663,8 +662,7 @@ static void dce60_mi_program_surface_config( ...@@ -663,8 +662,7 @@ static void dce60_mi_program_surface_config(
program_tiling(dce_mi, tiling_info); program_tiling(dce_mi, tiling_info);
dce60_program_size(dce_mi, rotation, plane_size); dce60_program_size(dce_mi, rotation, plane_size);
if (format >= SURFACE_PIXEL_FORMAT_GRPH_BEGIN && if (format < SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
format < SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
program_grph_pixel_format(dce_mi, format); program_grph_pixel_format(dce_mi, format);
} }
#endif #endif
......
...@@ -359,7 +359,7 @@ void pg_cntl35_mpcc_pg_control(struct pg_cntl *pg_cntl, ...@@ -359,7 +359,7 @@ void pg_cntl35_mpcc_pg_control(struct pg_cntl *pg_cntl,
if (pg_cntl->ctx->dc->idle_optimizations_allowed) if (pg_cntl->ctx->dc->idle_optimizations_allowed)
return; return;
if (mpcc_inst >= 0 && mpcc_inst < MAX_PIPES) if (mpcc_inst < MAX_PIPES)
pg_cntl->pg_pipe_res_enable[PG_MPCC][mpcc_inst] = power_on; pg_cntl->pg_pipe_res_enable[PG_MPCC][mpcc_inst] = power_on;
} }
...@@ -369,7 +369,7 @@ void pg_cntl35_opp_pg_control(struct pg_cntl *pg_cntl, ...@@ -369,7 +369,7 @@ void pg_cntl35_opp_pg_control(struct pg_cntl *pg_cntl,
if (pg_cntl->ctx->dc->idle_optimizations_allowed) if (pg_cntl->ctx->dc->idle_optimizations_allowed)
return; return;
if (opp_inst >= 0 && opp_inst < MAX_PIPES) if (opp_inst < MAX_PIPES)
pg_cntl->pg_pipe_res_enable[PG_OPP][opp_inst] = power_on; pg_cntl->pg_pipe_res_enable[PG_OPP][opp_inst] = power_on;
} }
...@@ -379,7 +379,7 @@ void pg_cntl35_optc_pg_control(struct pg_cntl *pg_cntl, ...@@ -379,7 +379,7 @@ void pg_cntl35_optc_pg_control(struct pg_cntl *pg_cntl,
if (pg_cntl->ctx->dc->idle_optimizations_allowed) if (pg_cntl->ctx->dc->idle_optimizations_allowed)
return; return;
if (optc_inst >= 0 && optc_inst < MAX_PIPES) if (optc_inst < MAX_PIPES)
pg_cntl->pg_pipe_res_enable[PG_OPTC][optc_inst] = power_on; pg_cntl->pg_pipe_res_enable[PG_OPTC][optc_inst] = power_on;
} }
......
...@@ -170,8 +170,7 @@ static enum gpio_result set_config( ...@@ -170,8 +170,7 @@ static enum gpio_result set_config(
return GPIO_RESULT_OK; return GPIO_RESULT_OK;
case GPIO_DDC_CONFIG_TYPE_POLL_FOR_CONNECT: case GPIO_DDC_CONFIG_TYPE_POLL_FOR_CONNECT:
if ((hw_gpio->base.en >= GPIO_DDC_LINE_DDC1) && if (hw_gpio->base.en <= GPIO_DDC_LINE_DDC_VGA) {
(hw_gpio->base.en <= GPIO_DDC_LINE_DDC_VGA)) {
REG_UPDATE_3(ddc_setup, REG_UPDATE_3(ddc_setup,
DC_I2C_DDC1_ENABLE, 1, DC_I2C_DDC1_ENABLE, 1,
DC_I2C_DDC1_EDID_DETECT_ENABLE, 1, DC_I2C_DDC1_EDID_DETECT_ENABLE, 1,
...@@ -180,8 +179,7 @@ static enum gpio_result set_config( ...@@ -180,8 +179,7 @@ static enum gpio_result set_config(
} }
break; break;
case GPIO_DDC_CONFIG_TYPE_POLL_FOR_DISCONNECT: case GPIO_DDC_CONFIG_TYPE_POLL_FOR_DISCONNECT:
if ((hw_gpio->base.en >= GPIO_DDC_LINE_DDC1) && if (hw_gpio->base.en <= GPIO_DDC_LINE_DDC_VGA) {
(hw_gpio->base.en <= GPIO_DDC_LINE_DDC_VGA)) {
REG_UPDATE_3(ddc_setup, REG_UPDATE_3(ddc_setup,
DC_I2C_DDC1_ENABLE, 1, DC_I2C_DDC1_ENABLE, 1,
DC_I2C_DDC1_EDID_DETECT_ENABLE, 1, DC_I2C_DDC1_EDID_DETECT_ENABLE, 1,
...@@ -190,8 +188,7 @@ static enum gpio_result set_config( ...@@ -190,8 +188,7 @@ static enum gpio_result set_config(
} }
break; break;
case GPIO_DDC_CONFIG_TYPE_DISABLE_POLLING: case GPIO_DDC_CONFIG_TYPE_DISABLE_POLLING:
if ((hw_gpio->base.en >= GPIO_DDC_LINE_DDC1) && if (hw_gpio->base.en <= GPIO_DDC_LINE_DDC_VGA) {
(hw_gpio->base.en <= GPIO_DDC_LINE_DDC_VGA)) {
REG_UPDATE_2(ddc_setup, REG_UPDATE_2(ddc_setup,
DC_I2C_DDC1_ENABLE, 0, DC_I2C_DDC1_ENABLE, 0,
DC_I2C_DDC1_EDID_DETECT_ENABLE, 0); DC_I2C_DDC1_EDID_DETECT_ENABLE, 0);
...@@ -231,7 +228,7 @@ void dal_hw_ddc_init( ...@@ -231,7 +228,7 @@ void dal_hw_ddc_init(
enum gpio_id id, enum gpio_id id,
uint32_t en) uint32_t en)
{ {
if ((en < GPIO_DDC_LINE_MIN) || (en > GPIO_DDC_LINE_MAX)) { if (en > GPIO_DDC_LINE_MAX) {
ASSERT_CRITICAL(false); ASSERT_CRITICAL(false);
*hw_ddc = NULL; *hw_ddc = NULL;
} }
......
...@@ -106,7 +106,7 @@ void dal_hw_generic_init( ...@@ -106,7 +106,7 @@ void dal_hw_generic_init(
enum gpio_id id, enum gpio_id id,
uint32_t en) uint32_t en)
{ {
if ((en < GPIO_DDC_LINE_MIN) || (en > GPIO_DDC_LINE_MAX)) { if (en > GPIO_DDC_LINE_MAX) {
ASSERT_CRITICAL(false); ASSERT_CRITICAL(false);
*hw_generic = NULL; *hw_generic = NULL;
} }
......
...@@ -127,7 +127,7 @@ void dal_hw_hpd_init( ...@@ -127,7 +127,7 @@ void dal_hw_hpd_init(
enum gpio_id id, enum gpio_id id,
uint32_t en) uint32_t en)
{ {
if ((en < GPIO_DDC_LINE_MIN) || (en > GPIO_DDC_LINE_MAX)) { if (en > GPIO_DDC_LINE_MAX) {
ASSERT_CRITICAL(false); ASSERT_CRITICAL(false);
*hw_hpd = NULL; *hw_hpd = NULL;
} }
......
...@@ -76,7 +76,7 @@ static const struct irq_source_info *find_irq_source_info( ...@@ -76,7 +76,7 @@ static const struct irq_source_info *find_irq_source_info(
struct irq_service *irq_service, struct irq_service *irq_service,
enum dc_irq_source source) enum dc_irq_source source)
{ {
if (source >= DAL_IRQ_SOURCES_NUMBER || source < DC_IRQ_SOURCE_INVALID) if (source >= DAL_IRQ_SOURCES_NUMBER)
return NULL; return NULL;
return &irq_service->info[source]; return &irq_service->info[source];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment