analogix_dp_init_analog_func() always returned 0, so the error check in its only caller, analogix_dp_set_bridge(), never took the jump to the common error path. Make the function void and drop the check. No functional change.
Suggested-by: Brian Norris <[email protected]> Link: https://lore.kernel.org/all/[email protected]/ Fixes: 3efe2ace7f5b ("drm/bridge: analogix_dp: move basic controller init into runtime PM") Signed-off-by: Marek Szyprowski <[email protected]> --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +--- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 8bb4c48aa3b4..a41c16b7dcbe 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -996,9 +996,7 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp) pm_runtime_get_sync(dp->dev); - ret = analogix_dp_init_analog_func(dp); - if (ret) - return ret; + analogix_dp_init_analog_func(dp); /* * According to DP spec v1.3 chap 3.5.1.2 Link Training, diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h index 4560597604ad..440007e2270d 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h @@ -192,7 +192,7 @@ void analogix_dp_set_pll_power_down(struct analogix_dp_device *dp, bool enable); void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, enum analog_power_block block, bool enable); -int analogix_dp_init_analog_func(struct analogix_dp_device *dp); +void analogix_dp_init_analog_func(struct analogix_dp_device *dp); void analogix_dp_init_hpd(struct analogix_dp_device *dp); void analogix_dp_force_hpd(struct analogix_dp_device *dp); enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp); diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c index c1344a3f013a..3d196cf96fb9 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -351,7 +351,7 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, } } -int analogix_dp_init_analog_func(struct analogix_dp_device *dp) +void analogix_dp_init_analog_func(struct analogix_dp_device *dp) { u32 reg; @@ -372,7 +372,6 @@ int analogix_dp_init_analog_func(struct analogix_dp_device *dp) reg &= ~(SERDES_FIFO_FUNC_EN_N | LS_CLK_DOMAIN_FUNC_EN_N | AUX_FUNC_EN_N); writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2); - return 0; } void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp) -- 2.43.0
