linux-samsung-soc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime@cerno.tech>
To: Andrzej Hajda <a.hajda@samsung.com>,
	Sam Ravnborg <sam@ravnborg.org>,
	Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>, Jonas Karlman <jonas@kwiboo.se>,
	Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
	Thierry Reding <thierry.reding@gmail.com>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	Maxime Ripard <maxime@cerno.tech>,
	Neil Armstrong <narmstrong@baylibre.com>,
	Robert Foss <robert.foss@linaro.org>,
	Jernej Skrabec <jernej.skrabec@gmail.com>
Cc: Sean Paul <sean@poorly.run>,
	freedreno@lists.freedesktop.org,
	Kyungmin Park <kyungmin.park@samsung.com>,
	linux-kernel@vger.kernel.org,
	Xinliang Liu <xinliang.liu@linaro.org>,
	Seung-Woo Kim <sw0312.kim@samsung.com>,
	Tian Tao <tiantao6@hisilicon.com>,
	Inki Dae <inki.dae@samsung.com>,
	linux-samsung-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	Rob Clark <robdclark@gmail.com>,
	dri-devel@lists.freedesktop.org,
	John Stultz <john.stultz@linaro.org>,
	Chen Feng <puck.chen@hisilicon.com>,
	Xinwei Kong <kong.kongxinwei@hisilicon.com>,
	Joonyoung Shim <jy0922.shim@samsung.com>
Subject: [PATCH v4 11/24] drm/bridge: lt9611: Switch to devm MIPI-DSI helpers
Date: Fri, 10 Sep 2021 12:12:05 +0200	[thread overview]
Message-ID: <20210910101218.1632297-12-maxime@cerno.tech> (raw)
In-Reply-To: <20210910101218.1632297-1-maxime@cerno.tech>

Let's switch to the new devm MIPI-DSI function to register and attach
our secondary device.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 drivers/gpu/drm/bridge/lontium-lt9611.c | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
index 29b1ce2140ab..654131aca5ed 100644
--- a/drivers/gpu/drm/bridge/lontium-lt9611.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
@@ -760,6 +760,7 @@ static struct mipi_dsi_device *lt9611_attach_dsi(struct lt9611 *lt9611,
 	const struct mipi_dsi_device_info info = { "lt9611", 0, NULL };
 	struct mipi_dsi_device *dsi;
 	struct mipi_dsi_host *host;
+	struct device *dev = lt9611->dev;
 	int ret;
 
 	host = of_find_mipi_dsi_host_by_node(dsi_node);
@@ -768,7 +769,7 @@ static struct mipi_dsi_device *lt9611_attach_dsi(struct lt9611 *lt9611,
 		return ERR_PTR(-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(lt9611->dev, "failed to create dsi device\n");
 		return dsi;
@@ -779,29 +780,15 @@ static struct mipi_dsi_device *lt9611_attach_dsi(struct lt9611 *lt9611,
 	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
 			  MIPI_DSI_MODE_VIDEO_HSE;
 
-	ret = mipi_dsi_attach(dsi);
+	ret = devm_mipi_dsi_attach(dev, dsi);
 	if (ret < 0) {
-		dev_err(lt9611->dev, "failed to attach dsi to host\n");
-		mipi_dsi_device_unregister(dsi);
+		dev_err(dev, "failed to attach dsi to host\n");
 		return ERR_PTR(ret);
 	}
 
 	return dsi;
 }
 
-static void lt9611_bridge_detach(struct drm_bridge *bridge)
-{
-	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
-
-	if (lt9611->dsi1) {
-		mipi_dsi_detach(lt9611->dsi1);
-		mipi_dsi_device_unregister(lt9611->dsi1);
-	}
-
-	mipi_dsi_detach(lt9611->dsi0);
-	mipi_dsi_device_unregister(lt9611->dsi0);
-}
-
 static int lt9611_connector_init(struct drm_bridge *bridge, struct lt9611 *lt9611)
 {
 	int ret;
@@ -855,9 +842,7 @@ static int lt9611_bridge_attach(struct drm_bridge *bridge,
 	return 0;
 
 err_unregister_dsi0:
-	lt9611_bridge_detach(bridge);
 	drm_connector_cleanup(&lt9611->connector);
-	mipi_dsi_device_unregister(lt9611->dsi0);
 
 	return ret;
 }
@@ -952,7 +937,6 @@ static void lt9611_bridge_hpd_enable(struct drm_bridge *bridge)
 
 static const struct drm_bridge_funcs lt9611_bridge_funcs = {
 	.attach = lt9611_bridge_attach,
-	.detach = lt9611_bridge_detach,
 	.mode_valid = lt9611_bridge_mode_valid,
 	.enable = lt9611_bridge_enable,
 	.disable = lt9611_bridge_disable,
-- 
2.31.1


  parent reply	other threads:[~2021-09-10 10:13 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-10 10:11 [PATCH v4 00/24] drm/bridge: Make panel and bridge probe order consistent Maxime Ripard
2021-09-10 10:11 ` [PATCH v4 01/24] drm/bridge: Add documentation sections Maxime Ripard
2021-09-24 17:52   ` (subset) " Maxime Ripard
2021-09-10 10:11 ` [PATCH v4 02/24] drm/bridge: Document the probe issue with MIPI-DSI bridges Maxime Ripard
2021-09-13  6:29   ` Andrzej Hajda
2021-09-14 14:35     ` Maxime Ripard
2021-09-14 19:00       ` Andrzej Hajda
2021-09-22  8:57         ` Maxime Ripard
2021-09-24 17:52   ` (subset) " Maxime Ripard
2021-09-10 10:11 ` [PATCH v4 03/24] drm/mipi-dsi: Create devm device registration Maxime Ripard
2021-09-24 17:52   ` (subset) " Maxime Ripard
2021-09-10 10:11 ` [PATCH v4 04/24] drm/mipi-dsi: Create devm device attachment Maxime Ripard
2021-09-24 17:52   ` (subset) " Maxime Ripard
2021-09-10 10:11 ` [PATCH v4 05/24] drm/bridge: adv7533: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 06/24] drm/bridge: adv7511: Register and attach our DSI device at probe Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 07/24] drm/bridge: anx7625: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 08/24] drm/bridge: anx7625: Register and attach our DSI device at probe Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 09/24] drm/bridge: lt8912b: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 10/24] drm/bridge: lt8912b: Register and attach our DSI device at probe Maxime Ripard
2021-09-10 10:12 ` Maxime Ripard [this message]
2021-09-10 10:12 ` [PATCH v4 12/24] drm/bridge: lt9611: " Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 13/24] drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 14/24] drm/bridge: lt9611uxc: Register and attach our DSI device at probe Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 15/24] drm/bridge: ps8640: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 16/24] drm/bridge: ps8640: Register and attach our DSI device at probe Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 17/24] drm/bridge: sn65dsi83: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 18/24] drm/bridge: sn65dsi83: Register and attach our DSI device at probe Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 19/24] drm/bridge: sn65dsi86: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 20/24] drm/bridge: sn65dsi86: Register and attach our DSI device at probe Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 21/24] drm/bridge: tc358775: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 22/24] drm/bridge: tc358775: Register and attach our DSI device at probe Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 23/24] drm/kirin: dsi: Adjust probe order Maxime Ripard
2021-09-10 10:12 ` [PATCH v4 24/24] drm/exynos: " Maxime Ripard
2021-09-13 10:30   ` Andrzej Hajda
2021-09-17 12:35     ` Marek Szyprowski
2021-09-22  8:53       ` Maxime Ripard
2021-09-23  8:14         ` Marek Szyprowski
2021-09-29 21:27 ` [PATCH v4 00/24] drm/bridge: Make panel and bridge probe order consistent John Stultz
2021-09-29 21:32   ` John Stultz
2021-09-29 21:51     ` John Stultz
2021-09-29 23:25       ` Rob Clark
2021-09-29 23:25         ` John Stultz
2021-09-30  2:30         ` John Stultz
2021-09-30 19:49         ` Amit Pundir
2021-09-30 20:20           ` Caleb Connolly
2021-10-13 14:16             ` Maxime Ripard
2021-10-14  0:16               ` [Freedreno] " Rob Clark
2021-10-18 12:34                 ` Maxime Ripard
2021-10-18 15:55                   ` Rob Clark
2021-09-29 23:29       ` John Stultz
2021-10-13 13:45         ` Maxime Ripard
2021-09-29 21:56 ` Laurent Pinchart
2021-10-03 13:25   ` Laurent Pinchart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210910101218.1632297-12-maxime@cerno.tech \
    --to=maxime@cerno.tech \
    --cc=Laurent.pinchart@ideasonboard.com \
    --cc=a.hajda@samsung.com \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=inki.dae@samsung.com \
    --cc=jernej.skrabec@gmail.com \
    --cc=john.stultz@linaro.org \
    --cc=jonas@kwiboo.se \
    --cc=jy0922.shim@samsung.com \
    --cc=kong.kongxinwei@hisilicon.com \
    --cc=kyungmin.park@samsung.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=narmstrong@baylibre.com \
    --cc=puck.chen@hisilicon.com \
    --cc=robdclark@gmail.com \
    --cc=robert.foss@linaro.org \
    --cc=sam@ravnborg.org \
    --cc=sean@poorly.run \
    --cc=sw0312.kim@samsung.com \
    --cc=thierry.reding@gmail.com \
    --cc=tiantao6@hisilicon.com \
    --cc=tzimmermann@suse.de \
    --cc=xinliang.liu@linaro.org \
    --subject='Re: [PATCH v4 11/24] drm/bridge: lt9611: Switch to devm MIPI-DSI helpers' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).