summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/displays/panel-dpi.c')
-rw-r--r--drivers/gpu/drm/omapdrm/displays/panel-dpi.c27
1 files changed, 4 insertions, 23 deletions
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index 8c17ad4ddf84..91f99c95c4c4 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -34,33 +34,15 @@ struct panel_drv_data {
#define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
-static int panel_dpi_connect(struct omap_dss_device *dssdev)
+static int panel_dpi_connect(struct omap_dss_device *src,
+ struct omap_dss_device *dst)
{
- struct omap_dss_device *src;
- int r;
-
- src = omapdss_of_find_connected_device(dssdev->dev->of_node, 0);
- if (IS_ERR_OR_NULL(src)) {
- dev_err(dssdev->dev, "failed to find video source\n");
- return src ? PTR_ERR(src) : -EINVAL;
- }
-
- r = omapdss_device_connect(dssdev->dss, src, dssdev);
- if (r) {
- omapdss_device_put(src);
- return r;
- }
-
return 0;
}
-static void panel_dpi_disconnect(struct omap_dss_device *dssdev)
+static void panel_dpi_disconnect(struct omap_dss_device *src,
+ struct omap_dss_device *dst)
{
- struct omap_dss_device *src = dssdev->src;
-
- omapdss_device_disconnect(src, dssdev);
-
- omapdss_device_put(src);
}
static int panel_dpi_enable(struct omap_dss_device *dssdev)
@@ -233,7 +215,6 @@ static int __exit panel_dpi_remove(struct platform_device *pdev)
omapdss_device_unregister(dssdev);
panel_dpi_disable(dssdev);
- omapdss_device_disconnect(dssdev, NULL);
return 0;
}