From patchwork Fri Mar 8 11:51:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 2237211 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 4F94D4006E for ; Fri, 8 Mar 2013 11:52:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933591Ab3CHLw2 (ORCPT ); Fri, 8 Mar 2013 06:52:28 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:33516 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933516Ab3CHLwZ (ORCPT ); Fri, 8 Mar 2013 06:52:25 -0500 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r28BqPbe018192; Fri, 8 Mar 2013 05:52:25 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r28BqP4E020812; Fri, 8 Mar 2013 05:52:25 -0600 Received: from dlelxv22.itg.ti.com (172.17.1.197) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Fri, 8 Mar 2013 05:52:24 -0600 Received: from deskari.tieu.ti.com (h64-3.vpn.ti.com [172.24.64.3]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r28Bq5oG006052; Fri, 8 Mar 2013 05:52:24 -0600 From: Tomi Valkeinen To: Archit Taneja , , CC: Tomi Valkeinen Subject: [PATCH 14/20] OMAPDSS: remove dssdev->channel assignments Date: Fri, 8 Mar 2013 13:51:49 +0200 Message-ID: <1362743515-10152-15-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362743515-10152-1-git-send-email-tomi.valkeinen@ti.com> References: <1362743515-10152-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Now that the driver uses ooutput->recommended_channel, we can remove the uses of the hacky dssdev->channel field. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dpi.c | 2 -- drivers/video/omap2/dss/dsi.c | 2 -- drivers/video/omap2/dss/hdmi.c | 2 -- drivers/video/omap2/dss/rfbi.c | 2 -- drivers/video/omap2/dss/sdi.c | 2 -- drivers/video/omap2/dss/venc.c | 2 -- 6 files changed, 12 deletions(-) diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index eba6b87..775214c 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -432,8 +432,6 @@ static int __init dpi_init_display(struct omap_dss_device *dssdev) DSSDBG("init_display\n"); - dssdev->channel = dpi_get_channel(); - if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI) && dpi.vdds_dsi_reg == NULL) { struct regulator *vdds_dsi; diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index e0c9e31..f44316a 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -5000,8 +5000,6 @@ static int __init dsi_init_display(struct omap_dss_device *dssdev) DSSDBG("DSI init\n"); - dssdev->channel = dsi_get_channel(dsi->module_id); - if (dsi->vdds_dsi_reg == NULL) { struct regulator *vdds_dsi; diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index e4c3be4..a49e73f 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -1012,8 +1012,6 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev) hdmi.ls_oe_gpio = priv->ls_oe_gpio; hdmi.hpd_gpio = priv->hpd_gpio; - dssdev->channel = OMAP_DSS_CHANNEL_DIGIT; - r = hdmi_init_display(dssdev); if (r) { DSSERR("device %s init failed: %d\n", dssdev->name, r); diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c index 991ec93..48d51ca 100644 --- a/drivers/video/omap2/dss/rfbi.c +++ b/drivers/video/omap2/dss/rfbi.c @@ -945,8 +945,6 @@ EXPORT_SYMBOL(omapdss_rfbi_display_disable); static int __init rfbi_init_display(struct omap_dss_device *dssdev) { - dssdev->channel = OMAP_DSS_CHANNEL_LCD; - rfbi.dssdev[dssdev->phy.rfbi.channel] = dssdev; return 0; } diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c index c797b33..eb4ee17 100644 --- a/drivers/video/omap2/dss/sdi.c +++ b/drivers/video/omap2/dss/sdi.c @@ -186,8 +186,6 @@ static int __init sdi_init_display(struct omap_dss_device *dssdev) { DSSDBG("SDI init\n"); - dssdev->channel = OMAP_DSS_CHANNEL_LCD; - if (sdi.vdds_sdi_reg == NULL) { struct regulator *vdds_sdi; diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index b85fd3d..6d25a12 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -786,8 +786,6 @@ static void __init venc_probe_pdata(struct platform_device *vencdev) dss_copy_device_pdata(dssdev, plat_dssdev); - dssdev->channel = OMAP_DSS_CHANNEL_DIGIT; - r = venc_init_display(dssdev); if (r) { DSSERR("device %s init failed: %d\n", dssdev->name, r);