From patchwork Tue Nov 24 12:45:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 11928549 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7296C2D0E4 for ; Tue, 24 Nov 2020 12:48:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 65CEE2076E for ; Tue, 24 Nov 2020 12:48:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="SoAX/HCD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387717AbgKXMs6 (ORCPT ); Tue, 24 Nov 2020 07:48:58 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:40254 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732709AbgKXMs6 (ORCPT ); Tue, 24 Nov 2020 07:48:58 -0500 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 0AOCmpIt033322; Tue, 24 Nov 2020 06:48:51 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1606222131; bh=ML32Txo+pRXlXKHucNRzj0hRlGc9qVGd9NZYOlFyXmo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=SoAX/HCDa/sXT27SZxnM8Y7jEv+mEnHUCPg34yCLD/6moHPjXEn/O++drRFCx/KB4 ilCYhdS9GKKCvrucC10SOdCh2soOwdPaGccZfgNCXhht0hqQtJiuHeL4L18+U+v/pw rJAu7sRUbJPv4hTj4T10JuA0EBTpTn0hCIFDo2OY= Received: from DFLE102.ent.ti.com (dfle102.ent.ti.com [10.64.6.23]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 0AOCmphR109539 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 24 Nov 2020 06:48:51 -0600 Received: from DFLE102.ent.ti.com (10.64.6.23) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Tue, 24 Nov 2020 06:48:50 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Tue, 24 Nov 2020 06:48:50 -0600 Received: from deskari.lan (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 0AOCjmq3040922; Tue, 24 Nov 2020 06:48:48 -0600 From: Tomi Valkeinen To: Sebastian Reichel , Laurent Pinchart , Nikhil Devshatwar , , CC: Sekhar Nori , Tony Lindgren , , Tomi Valkeinen Subject: [PATCH v4 74/80] drm/omap: dsi: display_disable cleanup Date: Tue, 24 Nov 2020 14:45:32 +0200 Message-ID: <20201124124538.660710-75-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201124124538.660710-1-tomi.valkeinen@ti.com> References: <20201124124538.660710-1-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org We can drop dsi_display_disable() which just calls _dsi_display_disable(), and rename _dsi_display_disable() to dsi_display_disable(). Signed-off-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/omapdrm/dss/dsi.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index e50418db71ef..d23fc43f1d1e 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -63,8 +63,6 @@ static int dsi_vc_send_null(struct dsi_data *dsi, int vc, int channel); static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi, int vc, const struct mipi_dsi_msg *msg); -static void dsi_display_disable(struct omap_dss_device *dssdev); - #ifdef DSI_PERF_MEASURE static bool dsi_perf; module_param(dsi_perf, bool, 0644); @@ -3767,7 +3765,7 @@ static void dsi_display_enable(struct dsi_data *dsi) DSSDBG("dsi_display_ulps_enable FAILED\n"); } -static void _dsi_display_disable(struct dsi_data *dsi, +static void dsi_display_disable(struct dsi_data *dsi, bool disconnect_lanes, bool enter_ulps) { WARN_ON(!dsi_bus_is_locked(dsi)); @@ -3786,17 +3784,6 @@ static void _dsi_display_disable(struct dsi_data *dsi, mutex_unlock(&dsi->lock); } -static void dsi_display_disable(struct omap_dss_device *dssdev) -{ - struct dsi_data *dsi = to_dsi_data(dssdev); - - WARN_ON(!dsi_bus_is_locked(dsi)); - - DSSDBG("dsi_display_disable\n"); - - _dsi_display_disable(dsi, true, false); -} - static int dsi_enable_te(struct dsi_data *dsi, bool enable) { dsi->te_enabled = enable; @@ -3820,7 +3807,7 @@ static void omap_dsi_ulps_work_callback(struct work_struct *work) dsi_enable_te(dsi, false); - _dsi_display_disable(dsi, false, true); + dsi_display_disable(dsi, false, true); dsi_bus_unlock(dsi); } @@ -4954,7 +4941,7 @@ static void dsi_bridge_disable(struct drm_bridge *bridge) dsi_disable_video_output(dssdev, VC_VIDEO); - dsi_display_disable(dssdev); + dsi_display_disable(dsi, true, false); dsi_bus_unlock(dsi); }