| Message ID | 20210416153909.v4.13.I1e627eb5f316c0cf6595b120e6e262f5bf890300@changeid |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm: Fix EDID reading on ti-sn65dsi86; solve some chicken-and-egg problems | expand |
On Fri 16 Apr 17:39 CDT 2021, Douglas Anderson wrote: > 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. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > 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 >
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;
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(-)