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: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211025151536.1048186-19-maxime@cerno.tech

diff --git a/drivers/gpu/drm/bridge/tc358775.c b/drivers/gpu/drm/bridge/tc358775.c
index 2272adcc5b4adbd0c855e82ad8df1ca24f5bf36a..35e66d1b645609392399711699f40fd82f23e245 100644 (file)
--- a/drivers/gpu/drm/bridge/tc358775.c
+++ b/drivers/gpu/drm/bridge/tc358775.c
@@ -610,11 +610,10 @@ static int tc_bridge_attach(struct drm_bridge *bridge,
                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)) {
                dev_err(dev, "failed to create dsi device\n");
-               ret = PTR_ERR(dsi);
-               goto err_dsi_device;
+               return PTR_ERR(dsi);
        }
 
        tc->dsi = dsi;
@@ -623,19 +622,15 @@ static int tc_bridge_attach(struct drm_bridge *bridge,
        dsi->format = MIPI_DSI_FMT_RGB888;
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO;
 
-       ret = mipi_dsi_attach(dsi);
+       ret = devm_mipi_dsi_attach(dev, dsi);
        if (ret < 0) {
                dev_err(dev, "failed to attach dsi to host\n");
-               goto err_dsi_attach;
+               return ret;
        }
 
        /* Attach the panel-bridge to the dsi bridge */
        return drm_bridge_attach(bridge->encoder, tc->panel_bridge,
                                 &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 = {