[PATCH v4 13/27] drm/bridge: ti-sn65dsi86: Use devm to do our runtime_disable

Douglas Anderson
2021-04-16T22:41:50Z

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>
---

(no changes since v1)

drivers/gpu/drm/bridge/ti-sn65dsi86.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index a200e88fd006..53f1f7b3022f 100644
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -1223,6 +1223,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)
{
@@ -1278,12 +1283,13 @@ static int ti_sn65dsi86_probe(struct i2c_client *client,
return ret;

pm_runtime_enable(dev);
+ ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev);
+ if (ret)
+ return ret;

ret = ti_sn_setup_gpio_controller(pdata);
- if (ret) {
- pm_runtime_disable(dev);
+ if (ret)
return ret;
- }

pdata->aux.name = "ti-sn65dsi86-aux";
pdata->aux.dev = dev;
@@ -1316,8 +1322,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;
--
2.31.1.368.gbe11c130af-goog