drm/omap: displays: Don't call disconnect handlers directly

pinchartl · tomba · commit 73fc0ac4a695 · 2018-09-03T16:13:26.000+03:00
In preparation for the move of checks from the disconnect handlers to
the omapdss_device_disconnect() function, replace direct calls to the
disconnect handlers at remove time with calls to
omapdss_device_disconnect().

Signed-off-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Signed-off-by: Tomi Valkeinen &lt;tomi.valkeinen@ti.com&gt;
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -193,7 +193,7 @@ static int __exit tvc_remove(struct platform_device *pdev)
 	omapdss_unregister_display(&ddata->dssdev);
 
 	tvc_disable(dssdev);
-	tvc_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -420,7 +420,7 @@ static int __exit dvic_remove(struct platform_device *pdev)
 	omapdss_unregister_display(&ddata->dssdev);
 
 	dvic_disable(dssdev);
-	dvic_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	i2c_put_adapter(ddata->i2c_adapter);
 
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -375,7 +375,7 @@ static int __exit hdmic_remove(struct platform_device *pdev)
 	omapdss_unregister_display(&ddata->dssdev);
 
 	hdmic_disable(dssdev);
-	hdmic_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -206,7 +206,7 @@ static int __exit opa362_remove(struct platform_device *pdev)
 
 	WARN_ON(omapdss_device_is_connected(dssdev));
 	if (omapdss_device_is_connected(dssdev))
-		opa362_disconnect(dssdev, dssdev->dst);
+		omapdss_device_disconnect(dssdev, dssdev->dst);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -229,7 +229,7 @@ static int __exit tfp410_remove(struct platform_device *pdev)
 
 	WARN_ON(omapdss_device_is_connected(dssdev));
 	if (omapdss_device_is_connected(dssdev))
-		tfp410_disconnect(dssdev, dssdev->dst);
+		omapdss_device_disconnect(dssdev, dssdev->dst);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -346,7 +346,7 @@ static int __exit tpd_remove(struct platform_device *pdev)
 
 	WARN_ON(omapdss_device_is_connected(dssdev));
 	if (omapdss_device_is_connected(dssdev))
-		tpd_disconnect(dssdev, dssdev->dst);
+		omapdss_device_disconnect(dssdev, dssdev->dst);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -241,7 +241,7 @@ static int __exit panel_dpi_remove(struct platform_device *pdev)
 	omapdss_unregister_display(dssdev);
 
 	panel_dpi_disable(dssdev);
-	panel_dpi_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -1408,7 +1408,7 @@ static int __exit dsicm_remove(struct platform_device *pdev)
 	omapdss_unregister_display(dssdev);
 
 	dsicm_disable(dssdev);
-	dsicm_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	sysfs_remove_group(&pdev->dev.kobj, &dsicm_attr_group);
 
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -292,7 +292,7 @@ static int lb035q02_panel_spi_remove(struct spi_device *spi)
 	omapdss_unregister_display(dssdev);
 
 	lb035q02_disable(dssdev);
-	lb035q02_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
@@ -318,7 +318,7 @@ static int nec_8048_remove(struct spi_device *spi)
 	omapdss_unregister_display(dssdev);
 
 	nec_8048_disable(dssdev);
-	nec_8048_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
@@ -292,7 +292,7 @@ static int __exit sharp_ls_remove(struct platform_device *pdev)
 	omapdss_unregister_display(dssdev);
 
 	sharp_ls_disable(dssdev);
-	sharp_ls_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
@@ -837,7 +837,7 @@ static int acx565akm_remove(struct spi_device *spi)
 	omapdss_unregister_display(dssdev);
 
 	acx565akm_disable(dssdev);
-	acx565akm_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
@@ -419,7 +419,7 @@ static int td028ttec1_panel_remove(struct spi_device *spi)
 	omapdss_unregister_display(dssdev);
 
 	td028ttec1_panel_disable(dssdev);
-	td028ttec1_panel_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
@@ -569,7 +569,7 @@ static int tpo_td043_remove(struct spi_device *spi)
 	omapdss_unregister_display(dssdev);
 
 	tpo_td043_disable(dssdev);
-	tpo_td043_disconnect(dssdev);
+	omapdss_device_disconnect(dssdev, NULL);
 
 	sysfs_remove_group(&spi->dev.kobj, &tpo_td043_attr_group);
 

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ static int __exit tvc_remove(struct platform_device *pdev)`
`193`	`193`	`omapdss_unregister_display(&ddata->dssdev);`
`194`	`194`
`195`	`195`	`tvc_disable(dssdev);`
`196`		`- tvc_disconnect(dssdev);`
	`196`	`+ omapdss_device_disconnect(dssdev, NULL);`
`197`	`197`
`198`	`198`	`return 0;`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ static int __exit hdmic_remove(struct platform_device *pdev)`
`375`	`375`	`omapdss_unregister_display(&ddata->dssdev);`
`376`	`376`
`377`	`377`	`hdmic_disable(dssdev);`
`378`		`- hdmic_disconnect(dssdev);`
	`378`	`+ omapdss_device_disconnect(dssdev, NULL);`
`379`	`379`
`380`	`380`	`return 0;`
`381`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ static int __exit opa362_remove(struct platform_device *pdev)`
`206`	`206`
`207`	`207`	`WARN_ON(omapdss_device_is_connected(dssdev));`
`208`	`208`	`if (omapdss_device_is_connected(dssdev))`
`209`		`- opa362_disconnect(dssdev, dssdev->dst);`
	`209`	`+ omapdss_device_disconnect(dssdev, dssdev->dst);`
`210`	`210`
`211`	`211`	`return 0;`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ static int __exit tfp410_remove(struct platform_device *pdev)`
`229`	`229`
`230`	`230`	`WARN_ON(omapdss_device_is_connected(dssdev));`
`231`	`231`	`if (omapdss_device_is_connected(dssdev))`
`232`		`- tfp410_disconnect(dssdev, dssdev->dst);`
	`232`	`+ omapdss_device_disconnect(dssdev, dssdev->dst);`
`233`	`233`
`234`	`234`	`return 0;`
`235`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ static int __exit tpd_remove(struct platform_device *pdev)`
`346`	`346`
`347`	`347`	`WARN_ON(omapdss_device_is_connected(dssdev));`
`348`	`348`	`if (omapdss_device_is_connected(dssdev))`
`349`		`- tpd_disconnect(dssdev, dssdev->dst);`
	`349`	`+ omapdss_device_disconnect(dssdev, dssdev->dst);`
`350`	`350`
`351`	`351`	`return 0;`
`352`	`352`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ static int __exit panel_dpi_remove(struct platform_device *pdev)`
`241`	`241`	`omapdss_unregister_display(dssdev);`
`242`	`242`
`243`	`243`	`panel_dpi_disable(dssdev);`
`244`		`- panel_dpi_disconnect(dssdev);`
	`244`	`+ omapdss_device_disconnect(dssdev, NULL);`
`245`	`245`
`246`	`246`	`return 0;`
`247`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ static int lb035q02_panel_spi_remove(struct spi_device *spi)`
`292`	`292`	`omapdss_unregister_display(dssdev);`
`293`	`293`
`294`	`294`	`lb035q02_disable(dssdev);`
`295`		`- lb035q02_disconnect(dssdev);`
	`295`	`+ omapdss_device_disconnect(dssdev, NULL);`
`296`	`296`
`297`	`297`	`return 0;`
`298`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ static int nec_8048_remove(struct spi_device *spi)`
`318`	`318`	`omapdss_unregister_display(dssdev);`
`319`	`319`
`320`	`320`	`nec_8048_disable(dssdev);`
`321`		`- nec_8048_disconnect(dssdev);`
	`321`	`+ omapdss_device_disconnect(dssdev, NULL);`
`322`	`322`
`323`	`323`	`return 0;`
`324`	`324`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ static int __exit sharp_ls_remove(struct platform_device *pdev)`
`292`	`292`	`omapdss_unregister_display(dssdev);`
`293`	`293`
`294`	`294`	`sharp_ls_disable(dssdev);`
`295`		`- sharp_ls_disconnect(dssdev);`
	`295`	`+ omapdss_device_disconnect(dssdev, NULL);`
`296`	`296`
`297`	`297`	`return 0;`
`298`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -837,7 +837,7 @@ static int acx565akm_remove(struct spi_device *spi)`
`837`	`837`	`omapdss_unregister_display(dssdev);`
`838`	`838`
`839`	`839`	`acx565akm_disable(dssdev);`
`840`		`- acx565akm_disconnect(dssdev);`
	`840`	`+ omapdss_device_disconnect(dssdev, NULL);`
`841`	`841`
`842`	`842`	`return 0;`
`843`	`843`	`}`