Unverified Commit a43dd76b authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: dsi: Switch to devm_drm_of_get_bridge 



The new devm_drm_of_get_bridge removes most of the boilerplate we
have to deal with. Let's switch to it.

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210910130941.1740182-4-maxime@cerno.tech
parent 0caddbbf

drivers/gpu/drm/vc4/vc4_dsi.c

+4 −24
Original line number Diff line number Diff line
@@ -1497,7 +1497,6 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) 
	struct drm_device *drm = dev_get_drvdata(master);

	struct vc4_dsi *dsi = dev_get_drvdata(dev);

	struct vc4_dsi_encoder *vc4_dsi_encoder;

	struct drm_panel *panel;

	const struct of_device_id *match;

	dma_cap_mask_t dma_mask;

	int ret;
@@ -1609,27 +1608,9 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) 
		return ret;

	}



	ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,

					  &panel, &dsi->bridge);

	if (ret) {

		/* If the bridge or panel pointed by dev->of_node is not

		 * enabled, just return 0 here so that we don't prevent the DRM

		 * dev from being registered. Of course that means the DSI

		 * encoder won't be exposed, but that's not a problem since

		 * nothing is connected to it.

		 */

		if (ret == -ENODEV)

			return 0;



		return ret;

	}



	if (panel) {

		dsi->bridge = devm_drm_panel_bridge_add_typed(dev, panel,

							      DRM_MODE_CONNECTOR_DSI);

	dsi->bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);

	if (IS_ERR(dsi->bridge))

		return PTR_ERR(dsi->bridge);

	}



	/* The esc clock rate is supposed to always be 100Mhz. */

	ret = clk_set_rate(dsi->escape_clock, 100 * 1000000);
@@ -1667,7 +1648,6 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master, 
{

	struct vc4_dsi *dsi = dev_get_drvdata(dev);



	if (dsi->bridge)

	pm_runtime_disable(dev);



	/*