Because clk_disable_unprepare() already checked NULL clock parameter, so the additional check is unnecessary, just remove them.
Signed-off-by: Xu Wang vulab@iscas.ac.cn --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 0c79a9ba48bb..dda4fa9a1a08 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -3440,8 +3440,7 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
err_iahb: clk_disable_unprepare(hdmi->iahb_clk); - if (hdmi->cec_clk) - clk_disable_unprepare(hdmi->cec_clk); + clk_disable_unprepare(hdmi->cec_clk); err_isfr: clk_disable_unprepare(hdmi->isfr_clk); err_res: @@ -3465,8 +3464,7 @@ void dw_hdmi_remove(struct dw_hdmi *hdmi)
clk_disable_unprepare(hdmi->iahb_clk); clk_disable_unprepare(hdmi->isfr_clk); - if (hdmi->cec_clk) - clk_disable_unprepare(hdmi->cec_clk); + clk_disable_unprepare(hdmi->cec_clk);
if (hdmi->i2c) i2c_del_adapter(&hdmi->i2c->adap);
Hi Xu Wang,
Thank you for the patch.
On Fri, Nov 27, 2020 at 09:23:32AM +0000, Xu Wang wrote:
Because clk_disable_unprepare() already checked NULL clock parameter, so the additional check is unnecessary, just remove them.
Signed-off-by: Xu Wang vulab@iscas.ac.cn
Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 0c79a9ba48bb..dda4fa9a1a08 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -3440,8 +3440,7 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
err_iahb: clk_disable_unprepare(hdmi->iahb_clk);
- if (hdmi->cec_clk)
clk_disable_unprepare(hdmi->cec_clk);
- clk_disable_unprepare(hdmi->cec_clk);
err_isfr: clk_disable_unprepare(hdmi->isfr_clk); err_res: @@ -3465,8 +3464,7 @@ void dw_hdmi_remove(struct dw_hdmi *hdmi)
clk_disable_unprepare(hdmi->iahb_clk); clk_disable_unprepare(hdmi->isfr_clk);
- if (hdmi->cec_clk)
clk_disable_unprepare(hdmi->cec_clk);
clk_disable_unprepare(hdmi->cec_clk);
if (hdmi->i2c) i2c_del_adapter(&hdmi->i2c->adap);
dri-devel@lists.freedesktop.org