From patchwork Wed Mar 17 12:35:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 86319 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2HCaTmX016463 for ; Wed, 17 Mar 2010 12:36:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754816Ab0CQMg1 (ORCPT ); Wed, 17 Mar 2010 08:36:27 -0400 Received: from smtp.nokia.com ([192.100.105.134]:17420 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754716Ab0CQMg0 (ORCPT ); Wed, 17 Mar 2010 08:36:26 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx09.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o2HCaDhW023586; Wed, 17 Mar 2010 07:36:26 -0500 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 17 Mar 2010 14:35:27 +0200 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 17 Mar 2010 14:35:26 +0200 Received: from localhost.localdomain (ucofw-nat2.nokia.com [131.228.1.90]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o2HCZMLp012147; Wed, 17 Mar 2010 14:35:25 +0200 From: Roger Quadros 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 14:35:20 +0200 Message-Id: <1268829321-29769-3-git-send-email-roger.quadros@nokia.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268829321-29769-2-git-send-email-roger.quadros@nokia.com> References: <1268829321-29769-1-git-send-email-roger.quadros@nokia.com> <1268829321-29769-2-git-send-email-roger.quadros@nokia.com> X-OriginalArrivalTime: 17 Mar 2010 12:35:26.0700 (UTC) FILETIME=[523ACAC0:01CAC5CE] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 17 Mar 2010 12:36:32 +0000 (UTC) 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();