OMAPDSS: Remove old way of setting manager and device links

Now that an omap_dss_output can be used to link between managers and devices, we
can remove the old way of setting manager and device links. This involves
removing the device and manager pointers from omap_overlay_manager and
omap_dss_device respectively, and removing the set_device/unset_device ops from
omap_overlay_manager.

Signed-off-by: Archit Taneja <archit@ti.com>

diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 4bd1c998e12d65be4d78cda6ba1bd47ab68a5161..2b1fa851a8b9f877c99362ff00159acdfc68d7f5 100644 (file)
--- 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)
 {

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index f662eb5c2aebf32858519506760f0d350f42dc33..c54d2f620ce3e5d94c4fb65ef39fb4fd150c44ab 100644 (file)
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -99,8 +99,6 @@ int dss_init_overlay_managers(struct platform_device *pdev)
                        break;
                }
 
-               mgr->set_device = &dss_mgr_set_device;
-               mgr->unset_device = &dss_mgr_unset_device;
                mgr->set_output = &dss_mgr_set_output;
                mgr->unset_output = &dss_mgr_unset_output;
                mgr->apply = &omap_dss_mgr_apply;

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index fd8f8be449d7863d444d21eeca23350eb6a4531f..e65e2e9e16eb7860348e39ba382edec86248261c 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -464,7 +464,6 @@ struct omap_overlay_manager {
        enum omap_dss_output_id supported_outputs;
 
        /* dynamic fields */
-       struct omap_dss_device *device;
        struct omap_dss_output *output;
 
        /*
@@ -478,9 +477,6 @@ struct omap_overlay_manager {
         * interrupt context
         */
 
-       int (*set_device)(struct omap_overlay_manager *mgr,
-               struct omap_dss_device *dssdev);
-       int (*unset_device)(struct omap_overlay_manager *mgr);
        int (*set_output)(struct omap_overlay_manager *mgr,
                struct omap_dss_output *output);
        int (*unset_output)(struct omap_overlay_manager *mgr);
@@ -628,7 +624,6 @@ struct omap_dss_device {
 
        enum omap_display_caps caps;
 
-       struct omap_overlay_manager *manager;
        struct omap_dss_output *output;
 
        enum omap_dss_display_state state;