Commit 526dcedf authored by Maxime Ripard's avatar Maxime Ripard

drm/bridge: tc358775: Switch to devm MIPI-DSI helpers

Let's switch to the new devm MIPI-DSI function to register and attach
our secondary device. This also avoids leaking the device when we detach
the bridge.
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211025151536.1048186-19-maxime@cerno.tech
parent c3b75d47
...@@ -610,11 +610,10 @@ static int tc_bridge_attach(struct drm_bridge *bridge, ...@@ -610,11 +610,10 @@ static int tc_bridge_attach(struct drm_bridge *bridge,
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
dsi = mipi_dsi_device_register_full(host, &info); dsi = devm_mipi_dsi_device_register_full(dev, host, &info);
if (IS_ERR(dsi)) { if (IS_ERR(dsi)) {
dev_err(dev, "failed to create dsi device\n"); dev_err(dev, "failed to create dsi device\n");
ret = PTR_ERR(dsi); return PTR_ERR(dsi);
goto err_dsi_device;
} }
tc->dsi = dsi; tc->dsi = dsi;
...@@ -623,19 +622,15 @@ static int tc_bridge_attach(struct drm_bridge *bridge, ...@@ -623,19 +622,15 @@ static int tc_bridge_attach(struct drm_bridge *bridge,
dsi->format = MIPI_DSI_FMT_RGB888; dsi->format = MIPI_DSI_FMT_RGB888;
dsi->mode_flags = MIPI_DSI_MODE_VIDEO; dsi->mode_flags = MIPI_DSI_MODE_VIDEO;
ret = mipi_dsi_attach(dsi); ret = devm_mipi_dsi_attach(dev, dsi);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to attach dsi to host\n"); dev_err(dev, "failed to attach dsi to host\n");
goto err_dsi_attach; return ret;
} }
/* Attach the panel-bridge to the dsi bridge */ /* Attach the panel-bridge to the dsi bridge */
return drm_bridge_attach(bridge->encoder, tc->panel_bridge, return drm_bridge_attach(bridge->encoder, tc->panel_bridge,
&tc->bridge, flags); &tc->bridge, flags);
err_dsi_attach:
mipi_dsi_device_unregister(dsi);
err_dsi_device:
return ret;
} }
static const struct drm_bridge_funcs tc_bridge_funcs = { static const struct drm_bridge_funcs tc_bridge_funcs = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment