1 files changed, 0 insertions, 64 deletions

diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 4bd1c998e12d..2b1fa851a8b9 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -1110,70 +1110,6 @@ void dss_mgr_get_info(struct omap_overlay_manager *mgr,
         spin_unlock_irqrestore(&data_lock, flags);
 }
 
-int dss_mgr_set_device(struct omap_overlay_manager *mgr,
-                struct omap_dss_device *dssdev)
-{
-        int r;
-
-        mutex_lock(&apply_lock);
-
-        if (dssdev->manager) {
-                DSSERR("display '%s' already has a manager '%s'\n",
-                               dssdev->name, dssdev->manager->name);
-                r = -EINVAL;
-                goto err;
-        }
-
-        if ((mgr->supported_displays & dssdev->type) == 0) {
-                DSSERR("display '%s' does not support manager '%s'\n",
-                               dssdev->name, mgr->name);
-                r = -EINVAL;
-                goto err;
-        }
-
-        dssdev->manager = mgr;
-        mgr->device = dssdev;
-
-        mutex_unlock(&apply_lock);
-
-        return 0;
-err:
-        mutex_unlock(&apply_lock);
-        return r;
-}
-
-int dss_mgr_unset_device(struct omap_overlay_manager *mgr)
-{
-        int r;
-
-        mutex_lock(&apply_lock);
-
-        if (!mgr->device) {
-                DSSERR("failed to unset display, display not set.\n");
-                r = -EINVAL;
-                goto err;
-        }
-
-        /*
-         * Don't allow currently enabled displays to have the overlay manager
-         * pulled out from underneath them
-         */
-        if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED) {
-                r = -EINVAL;
-                goto err;
-        }
-
-        mgr->device->manager = NULL;
-        mgr->device = NULL;
-
-        mutex_unlock(&apply_lock);
-
-        return 0;
-err:
-        mutex_unlock(&apply_lock);
-        return r;
-}
-
 int dss_mgr_set_output(struct omap_overlay_manager *mgr,
                 struct omap_dss_output *output)
 {