Unverified Commit 6cae235e authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/bridge: sn65dsi83: 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 but don't remove its driver.

Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Tested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211025151536.1048186-15-maxime@cerno.tech
parent c05f1a4e

drivers/gpu/drm/bridge/ti-sn65dsi83.c

+3 −9
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int sn65dsi83_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)) {

		return dev_err_probe(dev, PTR_ERR(dsi),

				     "failed to create dsi device\n");
@@ -274,18 +274,14 @@ static int sn65dsi83_attach(struct drm_bridge *bridge, 
	dsi->format = MIPI_DSI_FMT_RGB888;

	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST;



	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;

	}



	return drm_bridge_attach(bridge->encoder, ctx->panel_bridge,

				 &ctx->bridge, flags);



err_dsi_attach:

	mipi_dsi_device_unregister(dsi);

	return ret;

}



static void sn65dsi83_detach(struct drm_bridge *bridge)
@@ -295,8 +291,6 @@ static void sn65dsi83_detach(struct drm_bridge *bridge) 
	if (!ctx->dsi)

		return;



	mipi_dsi_detach(ctx->dsi);

	mipi_dsi_device_unregister(ctx->dsi);

	ctx->dsi = NULL;

}