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: Cai Huoqing <[email protected]>
Reviewed-by: Laurent Pinchart <[email protected]>
Signed-off-by: Robert Foss <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
index 70ab4fbdc23ed421cbd0baef43fb74d529be948b..c8f44bcb298a3e792471b22494459816d1e036ee 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
@@ -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,