Skip to contentSkip to conversation

drm/bridge: chipone-icn6211: use devm_drm_bridge_add in i2c probe

PATCH Applied Osama Abdelkader 2 participants 6 messages Apr 30 – May 19

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/2 drm/bridge: chipone-icn6211: use devm_drm_bridge_add in i2c probe

Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop drm_bridge_remove() in chipone_i2c_probe.

Fixes 8dde6f7452a1 ("drm: bridge: icn6211: Add I2C configuration support")

---
v4: refresh the patch
v3: split the patch into two, one for i2c probe (bugfix) and one for dsi probe,
and add Fixes and Cc tags
v2: devm_drm_bridge_add instead of drm_bridge_add
---

 drivers/gpu/drm/bridge/chipone-icn6211.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/chipone-icn6211.c +3 -1
index 814713c5bea9..553a1df4688d 100644
@@ -758,7 +758,9 @@ static int chipone_i2c_probe(struct i2c_client *client)
 	dev_set_drvdata(dev, icn);
 	i2c_set_clientdata(client, icn);
 
-	drm_bridge_add(&icn->bridge);
+	ret = devm_drm_bridge_add(dev, &icn->bridge);
+	if (ret)
+		return ret;
 
 	return chipone_dsi_host_attach(icn);
 }
Signature · 1 line
2.43.0
#1 lore raw

PATCH v4 2/2 drm/bridge: chipone-icn6211: use devm_drm_bridge_add in dsi probe

Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop drm_bridge_remove() in chipone_dsi_probe.

---
v4: drop drm_bridge_remove() in chipone_dsi_remove()
v3: split the patch into two, one for i2c probe (bugfix) and one for dsi probe
v2: devm_drm_bridge_add instead of drm_bridge_add
---

 drivers/gpu/drm/bridge/chipone-icn6211.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/gpu/drm/bridge/chipone-icn6211.c +3 -8
index 553a1df4688d..b12cd2690474 100644
@@ -730,13 +730,11 @@ static int chipone_dsi_probe(struct mipi_dsi_device *dsi)
 
 	mipi_dsi_set_drvdata(dsi, icn);
 
-	drm_bridge_add(&icn->bridge);
-
-	ret = chipone_dsi_attach(icn);
+	ret = devm_drm_bridge_add(dev, &icn->bridge);
 	if (ret)
-		drm_bridge_remove(&icn->bridge);
+		return ret;
 
-	return ret;
+	return chipone_dsi_attach(icn);
 }
 
 static int chipone_i2c_probe(struct i2c_client *client)
@@ -767,10 +765,7 @@ static int chipone_i2c_probe(struct i2c_client *client)
 
 static void chipone_dsi_remove(struct mipi_dsi_device *dsi)
 {
-	struct chipone *icn = mipi_dsi_get_drvdata(dsi);
-
 	mipi_dsi_detach(dsi);
-	drm_bridge_remove(&icn->bridge);
 }
 
 static const struct of_device_id chipone_of_match[] = {
Signature · 1 line
2.43.0
reviewer Reviewed-by on v4 2/2
#2 lore raw

Re: [PATCH v4 2/2] drm/bridge: chipone-icn6211: use devm_drm_bridge_add in dsi probe

drivers/gpu/drm/bridge/chipone-icn6211.c static int chipone_i2c_probe(struct i2c_client *client) · line 769

Quoted 13 lines · Osama Abdelkader
drivers/gpu/drm/bridge/chipone-icn6211.c +0 -3
index 553a1df4688d..b12cd2690474 100644
@@ -767,10 +765,7 @@ static int chipone_i2c_probe(struct i2c_client *client)
 
 static void chipone_dsi_remove(struct mipi_dsi_device *dsi)
 {
-	struct chipone *icn = mipi_dsi_get_drvdata(dsi);
-
 	mipi_dsi_detach(dsi);
-	drm_bridge_remove(&icn->bridge);
 }

A further improvement would be using devm_mipi_dsi_attach() so the entire remove function can be dropped. If you want to to that, please do it as a separate series, after this has been applied.

Signature · 3 lines
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
reviewer Applied
#4 lore raw

Re: (subset) [PATCH v4 1/2] drm/bridge: chipone-icn6211: use devm_drm_bridge_add in i2c probe

In reply to Osama Abdelkader
Quoted 2 lines · Osama Abdelkader

Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop drm_bridge_remove() in chipone_i2c_probe.

Applied, thanks!

[1/2] drm/bridge: chipone-icn6211: use devm_drm_bridge_add in i2c probe

      commit: 73d01051e8040c0b1de7fd26b3b8d0c2ffa6895c

Best regards,

Signature · 3 lines
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
reviewer Applied
#5 lore raw

Re: (subset) [PATCH v4 1/2] drm/bridge: chipone-icn6211: use devm_drm_bridge_add in i2c probe

In reply to Osama Abdelkader
Quoted 2 lines · Osama Abdelkader

Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop drm_bridge_remove() in chipone_i2c_probe.

Applied, thanks!

[2/2] drm/bridge: chipone-icn6211: use devm_drm_bridge_add in dsi probe

      commit: b11a6cea91f2cec688936d591548bc5c1540c648

Best regards,

Signature · 3 lines
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com