浏览代码

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

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 <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Laurent Pinchart 7 年之前
父节点
当前提交
73fc0ac4a6

+ 1 - 1
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;
 }

+ 1 - 1
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);
 

+ 1 - 1
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;
 }

+ 1 - 1
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;
 }

+ 1 - 1
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;
 }

+ 1 - 1
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;
 }

+ 1 - 1
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;
 }

+ 1 - 1
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);
 

+ 1 - 1
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;
 }

+ 1 - 1
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;
 }

+ 1 - 1
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;
 }

+ 1 - 1
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;
 }

+ 1 - 1
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;
 }

+ 1 - 1
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);