From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Date: Tue, 21 Aug 2012 06:10:29 +0000 Subject: [PATCH 22/23] OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disable Message-Id: <1345528711-27801-23-git-send-email-archit@ti.com> List-Id: References: <1345528711-27801-1-git-send-email-archit@ti.com> In-Reply-To: <1345528711-27801-1-git-send-email-archit@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: tomi.valkeinen@ti.com Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, rob@ti.com, sumit.semwal@ti.com, Archit Taneja An overlay isn't allowed to be enabled/disabled if it isn't connected to an omap_dss_device. This requirement isn't needed any more. An overlay can be enabled/disabled as long as it has an output connected to it. The output may not be connected to a device, but we can be assured that the connected manager's output is in use by an output interface. Signed-off-by: Archit Taneja --- drivers/video/omap2/dss/apply.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 8a05cbc..d584f0c 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -1607,8 +1607,7 @@ int dss_ovl_enable(struct omap_overlay *ovl) goto err1; } - if (ovl->manager = NULL || - ovl->manager->get_device(ovl->manager) = NULL) { + if (ovl->manager = NULL || ovl->manager->output = NULL) { r = -EINVAL; goto err1; } @@ -1677,8 +1676,7 @@ int dss_ovl_disable(struct omap_overlay *ovl) goto err; } - if (ovl->manager = NULL || - ovl->manager->get_device(ovl->manager) = NULL) { + if (ovl->manager = NULL || ovl->manager->output = NULL) { r = -EINVAL; goto err; } -- 1.7.9.5