Unverified Commit 9962601c authored by Cai Huoqing's avatar Cai Huoqing Committed by Robert Foss
Browse files

drm/bridge: dw-hdmi-cec: Make use of the helper function devm_add_action_or_reset() 



The helper function devm_add_action_or_reset() will internally
call devm_add_action(), and if devm_add_action() fails then it will
execute the action mentioned and return the error code. So
use devm_add_action_or_reset() instead of devm_add_action()
to simplify the error handling, reduce the code.

Signed-off-by: default avatarCai Huoqing <caihuoqing@baidu.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarRobert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210922125909.215-1-caihuoqing@baidu.com
parent 7fa828cb

drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c

+2 −4
Original line number Diff line number Diff line
@@ -265,11 +265,9 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) 
	/* override the module pointer */

	cec->adap->owner = THIS_MODULE;



	ret = devm_add_action(&pdev->dev, dw_hdmi_cec_del, cec);

	if (ret) {

		cec_delete_adapter(cec->adap);

	ret = devm_add_action_or_reset(&pdev->dev, dw_hdmi_cec_del, cec);

	if (ret)

		return ret;

	}



	ret = devm_request_threaded_irq(&pdev->dev, cec->irq,

					dw_hdmi_cec_hardirq,