linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Roger Quadros <roger.quadros@Nokia.com>
To: Tomi.Valkeinen@Nokia.com
Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org
Subject: [PATCHv2 2/3] OMAP: DSS2: Remove redundant enable/disable calls from SDI
Date: Wed, 17 Mar 2010 12:35:20 +0000	[thread overview]
Message-ID: <1268829321-29769-3-git-send-email-roger.quadros@nokia.com> (raw)
In-Reply-To: <1268829321-29769-2-git-send-email-roger.quadros@nokia.com>

From: Roger Quadros <roger.quadros@nokia.com>

Panel enable/disable is now done via the panel driver, so we should not
call the panel driver again

Signed-off-by: Roger Quadros <roger.quadros@nokia.com>
---
 drivers/video/omap2/dss/sdi.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 12eb404..3de3c1e 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -115,17 +115,9 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
 
 	dssdev->manager->enable(dssdev->manager);
 
-	if (dssdev->driver->enable) {
-		r = dssdev->driver->enable(dssdev);
-		if (r)
-			goto err3;
-	}
-
 	sdi.skip_init = 0;
 
 	return 0;
-err3:
-	dssdev->manager->disable(dssdev->manager);
 err2:
 	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
 err1:
@@ -137,9 +129,6 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable);
 
 void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
 {
-	if (dssdev->driver->disable)
-		dssdev->driver->disable(dssdev);
-
 	dssdev->manager->disable(dssdev->manager);
 
 	dss_sdi_disable();
-- 
1.6.3.3


  reply	other threads:[~2010-03-17 12:35 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-17 12:35 [PATCHv2 0/3] OMAP: DSS2: Allow us to use SDI Roger Quadros
2010-03-17 12:35 ` [PATCHv2 1/3] OMAP: DSS2: Add Kconfig option for DPI display type Roger Quadros
2010-03-17 12:35   ` Roger Quadros [this message]
2010-03-17 12:35     ` [PATCHv2 3/3] OMAP: DSS2: Use vdds_sdi regulator supply in SDI Roger Quadros
2010-03-17 14:10 ` [PATCHv2 0/3] OMAP: DSS2: Allow us to use SDI Tomi Valkeinen
2010-03-18  7:39   ` Roger Quadros
2010-03-23  8:45   ` Roger Quadros
2010-04-06 16:03   ` Roger Quadros
2010-04-07  5:35     ` Tomi Valkeinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1268829321-29769-3-git-send-email-roger.quadros@nokia.com \
    --to=roger.quadros@nokia.com \
    --cc=Tomi.Valkeinen@Nokia.com \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).