Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1632136pxa;
        Thu, 6 Aug 2020 12:02:43 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJyT1XhWkP4F0fpcbN9kaAOtt5bKoigZtphwJuxUdhkampQPALheSmUZRxheXIlo929+5wA2
X-Received: by 2002:a50:ed84:: with SMTP id h4mr5459700edr.278.1596740563263;
        Thu, 06 Aug 2020 12:02:43 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1596740563; cv=none;
        d=google.com; s=arc-20160816;
        b=z1fn9biwTsKuuKIpTc0JrUlajNanIWFvEIbwG+zsvBBpiZqNFX8Rk3kgWFFBOCEdRT
         CK9SVbv4s4ZVxzZ/6vMk8BKZJIuM9jg8LJAgu69fGy29gPAWjZDRFPJskWToLgorcTYp
         2hAMkCiCZNJvvHRmj3b472ZEErW4KPXFgDBe5hLxZTGVn0jgfBdoai/jKI80GaBE8fXC
         Sj68IGEIotXbP4yPQcPL7FPlpQXQZ3+FtWyClSCNXtZZkg9iI+3zzDUo0z1uuZGbtPLf
         Ihpj8ikCFuvBOW3aLDv++mE2QCdT23y+pLXGfWcYHvBZ+bvrvS5luoETnWfg7tcWSlGh
         Te2Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:sender:dkim-signature:mime-version:references
         :in-reply-to:message-id:date:subject:cc:to:from;
        bh=uZgxrGDkUOMRSXaG0qPPXkX0uRgXXAAvq4AEaGdQuMg=;
        b=uGUBtTnPRSm0fj16B59iMfgB9fGW2thPwOeTZ9RblJUoOxjUDdVdzj/VWnFHUKhBgK
         9J+2APbOGvhIhpkLRtAK20meqCV7urUnccUmD/ULZY6T2Ih/hrsAAKGX2f7BUUapLWAc
         C3dl/B3RSEuE9jxq/oTWCXaspR0NnvvfkbL7MGgHZWhbfFIR1fWK9w3MyJRo8zwpNj1c
         P64OYLF3RxozxOSUIwtljb1LRFUtAo8uZGXJdg4DRi3AhdbFIDgc2ssfgVacYVNjmzXe
         F/42H71Su5lwll0F+gKeFZpFhe8L5gfe5azK+p8YwkIrt0Y2LGpWxa2CSoR/csmIjk1f
         yabg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=MQ7MHx95;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id b6si4120020ejb.68.2020.08.06.12.02.17;
        Thu, 06 Aug 2020 12:02:43 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=MQ7MHx95;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1729459AbgHFTBw (ORCPT <rfc822;alexzyp@gmail.com> + 99 others);
        Thu, 6 Aug 2020 15:01:52 -0400
Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:11901 "EHLO
        hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728845AbgHFTBk (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 6 Aug 2020 15:01:40 -0400
Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA)
        id <B5f2c53860002>; Thu, 06 Aug 2020 12:01:26 -0700
Received: from hqmail.nvidia.com ([172.20.161.6])
  by hqpgpgate101.nvidia.com (PGP Universal service);
  Thu, 06 Aug 2020 12:01:40 -0700
X-PGP-Universal: processed;
        by hqpgpgate101.nvidia.com on Thu, 06 Aug 2020 12:01:40 -0700
Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL105.nvidia.com
 (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 6 Aug
 2020 19:01:39 +0000
Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL101.nvidia.com
 (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend
 Transport; Thu, 6 Aug 2020 19:01:39 +0000
Received: from skomatineni-linux.nvidia.com (Not Verified[10.2.172.190]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121)
        id <B5f2c53920000>; Thu, 06 Aug 2020 12:01:39 -0700
From:   Sowjanya Komatineni <skomatineni@nvidia.com>
To:     <skomatineni@nvidia.com>, <thierry.reding@gmail.com>,
        <jonathanh@nvidia.com>, <frankc@nvidia.com>, <hverkuil@xs4all.nl>,
        <sakari.ailus@iki.fi>, <robh+dt@kernel.org>,
        <helen.koike@collabora.com>
CC:     <digetx@gmail.com>, <gregkh@linuxfoundation.org>,
        <linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>,
        <linux-tegra@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v9 05/10] media: tegra-video: Separate CSI stream enable and disable implementations
Date:   Thu, 6 Aug 2020 12:01:29 -0700
Message-ID: <1596740494-19306-6-git-send-email-skomatineni@nvidia.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1596740494-19306-1-git-send-email-skomatineni@nvidia.com>
References: <1596740494-19306-1-git-send-email-skomatineni@nvidia.com>
X-NVConfidentiality: public
MIME-Version: 1.0
Content-Type: text/plain
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1596740486; bh=uZgxrGDkUOMRSXaG0qPPXkX0uRgXXAAvq4AEaGdQuMg=;
        h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer:
         In-Reply-To:References:X-NVConfidentiality:MIME-Version:
         Content-Type;
        b=MQ7MHx95vqfAGOnZtY1GK6KAkdyns87axypxoqozJA1VAxe2UJaT0HBODaNtWRPxi
         vKux3thZTg+NK8htd+59I6OGRjf5/AVAVkltCHDzpjgdqAvykd0adppEyN3EvJFtnJ
         YH64nItzVnnm+WZd3YiquC0cnEUk9RoUaC9Mk2SGHoB3pOXHpJnuZO8AsadRJBixAk
         kAW+Hf9SgFpDlbYfJok6sYqPQjPWNrPvecSAQvr36QXDizSptDLf+3Wb7aIaZEfSeW
         X8mE8ZIa/IPkPpAcXDpm9ZbdNSXSAnC0xsPkpa3HpvJVinunUDwuLMgLtUxAdWDORa
         o47ayf+jahLYw==
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This patch separates implementation of CSI stream enable and disable
into separate functions for readability.

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
---
 drivers/staging/media/tegra-video/csi.c | 51 ++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c
index fb667df..cfe6187 100644
--- a/drivers/staging/media/tegra-video/csi.c
+++ b/drivers/staging/media/tegra-video/csi.c
@@ -232,34 +232,53 @@ static int tegra_csi_g_frame_interval(struct v4l2_subdev *subdev,
 	return 0;
 }
 
-static int tegra_csi_s_stream(struct v4l2_subdev *subdev, int enable)
+static int tegra_csi_enable_stream(struct v4l2_subdev *subdev)
 {
 	struct tegra_vi_channel *chan = v4l2_get_subdev_hostdata(subdev);
 	struct tegra_csi_channel *csi_chan = to_csi_chan(subdev);
 	struct tegra_csi *csi = csi_chan->csi;
-	int ret = 0;
+	int ret;
+
+	ret = pm_runtime_get_sync(csi->dev);
+	if (ret < 0) {
+		dev_err(csi->dev, "failed to get runtime PM: %d\n", ret);
+		pm_runtime_put_noidle(csi->dev);
+		return ret;
+	}
 
 	csi_chan->pg_mode = chan->pg_mode;
-	if (enable) {
-		ret = pm_runtime_get_sync(csi->dev);
-		if (ret < 0) {
-			dev_err(csi->dev,
-				"failed to get runtime PM: %d\n", ret);
-			pm_runtime_put_noidle(csi->dev);
-			return ret;
-		}
+	ret = csi->ops->csi_start_streaming(csi_chan);
+	if (ret < 0)
+		goto rpm_put;
 
-		ret = csi->ops->csi_start_streaming(csi_chan);
-		if (ret < 0)
-			goto rpm_put;
+	return 0;
 
-		return 0;
-	}
+rpm_put:
+	pm_runtime_put(csi->dev);
+	return ret;
+}
+
+static int tegra_csi_disable_stream(struct v4l2_subdev *subdev)
+{
+	struct tegra_csi_channel *csi_chan = to_csi_chan(subdev);
+	struct tegra_csi *csi = csi_chan->csi;
 
 	csi->ops->csi_stop_streaming(csi_chan);
 
-rpm_put:
 	pm_runtime_put(csi->dev);
+
+	return 0;
+}
+
+static int tegra_csi_s_stream(struct v4l2_subdev *subdev, int enable)
+{
+	int ret;
+
+	if (enable)
+		ret = tegra_csi_enable_stream(subdev);
+	else
+		ret = tegra_csi_disable_stream(subdev);
+
 	return ret;
 }
 
-- 
2.7.4