drm/bridge: ti-sn65dsi86: Use devm to do our runtime_disable

There's no devm_runtime_enable(), but it's easy to use
devm_add_action_or_reset() and means we don't need to worry about the
disable in our remove() routine or in error paths.

No functional changes intended by this change.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423095743.v5.4.I1e627eb5f316c0cf6595b120e6e262f5bf890300@changeid

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index b1271865785b5236e641d5d45e50519dd0d3bf7d..443b532f6c6b7b47ba1a744a98847a471559c9c1 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -1214,6 +1214,11 @@ static void ti_sn_bridge_parse_lanes(struct ti_sn65dsi86 *pdata,
        pdata->ln_polrs = ln_polrs;
 }
 
+static void ti_sn65dsi86_runtime_disable(void *data)
+{
+       pm_runtime_disable(data);
+}
+
 static int ti_sn65dsi86_probe(struct i2c_client *client,
                              const struct i2c_device_id *id)
 {
@@ -1273,12 +1278,13 @@ static int ti_sn65dsi86_probe(struct i2c_client *client,
                return ret;
 
        pm_runtime_enable(pdata->dev);
+       ret = devm_add_action_or_reset(pdata->dev, ti_sn65dsi86_runtime_disable, pdata->dev);
+       if (ret)
+               return ret;
 
        ret = ti_sn_setup_gpio_controller(pdata);
-       if (ret) {
-               pm_runtime_disable(pdata->dev);
+       if (ret)
                return ret;
-       }
 
        i2c_set_clientdata(client, pdata);
 
@@ -1315,8 +1321,6 @@ static int ti_sn65dsi86_remove(struct i2c_client *client)
 
        drm_bridge_remove(&pdata->bridge);
 
-       pm_runtime_disable(pdata->dev);
-
        of_node_put(pdata->host_node);
 
        return 0;