From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91F28C433F5 for ; Fri, 11 Mar 2022 15:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=d5Vasjlt5amGiZGYGqRBZsUK2EfwgRhWdEdmcIJFGgI=; b=IQ6j4A3Pk1E12/ gdbU7DgdNmNTXkfy6vQmC2vBk6gD0JPqQdJIl/C4CbKcqMLS9bStF3U2suAs/7yUZjlv+tRuwYFPq hubFOZgHFeNg1HVrZtZ+9hlAbNdEGnl5jIsxDqDbgdkdAmoaX2ErxvzzH4qzLDFzuwiQTNsq1XkWi YMPAuabbGKn2edRHNPkJ+oUEiZ0p8ohs99fXp/RISmFipUexOHh28THFw/XmwTQiG5rJSxmvCIOWb //Cqzu28+n514jzNl8j0pFHpz13duyA/lSR6CWp7SFGhd/F2dwxzFWhL78azyuWUqxgnSxMfcUtj5 wUtu9QDhmSpGuIRISftA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSgzS-00H5BI-U6; Fri, 11 Mar 2022 15:15:39 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSguB-00H2oo-5W for linux-arm-kernel@bombadil.infradead.org; Fri, 11 Mar 2022 15:10:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=dfjOJcHpbpHzSsr3B+Uk57gfLY4CzVGb/sVf8hEV314=; b=qH4KBbcpL81MIEjCD/c9QkuUud oc4pWVh7wOQN1ms81zGArn7Cspb9owHx7RhUis5UI0DJWl35/pbPk6sTrKAZO4RC5LwF273d0nbRx cvvZ2JABDF6ZHo8Iif9nrdDT2I/uQ+/OlgQJ9bS/83ln9eyzYluRXeNTuIeGpH6VdlE8xDF/VWVzJ vI7JlB3mN7SBAQH08euaLMOThFmmsE3+a3x42lmWXRVm6OvuPiIUpSUoRBSsT2R8PsbUolPqpKPJl Plfi+A+wpWOR3RQs7x/UTYvvlRSovhi8MMlu+Y3a/2TmS0UIZiJrKdK2SXTozOdWWvfWYb3TXoc8T P6RxKezA==; Received: from relay1-d.mail.gandi.net ([217.70.183.193]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSgNd-00HTBk-3h for linux-arm-kernel@lists.infradead.org; Fri, 11 Mar 2022 14:36:35 +0000 Received: (Authenticated sender: paul.kocialkowski@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 0B290240014; Fri, 11 Mar 2022 14:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1647009392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dfjOJcHpbpHzSsr3B+Uk57gfLY4CzVGb/sVf8hEV314=; b=CoohK87AlPaywMzwJmaIsttnGN3W+d8K2ktXSOxHp1CIxMN4E+poHxiPpiowTiY1VVErz7 t4cd0SYFa/qXFEApLu/8MmRg6dcRhWc6EcJVN9HTyU+HEqBPdQdzU3T6Vhp2/K1hYhPCdy nMJBAB/yHeqtmHdsfkRC5Lzh7vrs05SldMCq5Vx8B9rseXYnBF18bPGAbkOVuUNiR90rvh 6toF/Pr1vxg1Tp6+Q7bEh/sL44SQ0dWtidYqgcP2fHsKtg+cn3adN4uGaxCs86BBL9h4Ds lHyA4U7IU2zS2jea8F6i/mipxj4ZOl8K3fvFgAhC7PGqy8vXDhFR7rcBvfGYsw== From: Paul Kocialkowski To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Cc: Yong Deng , Paul Kocialkowski , Mauro Carvalho Chehab , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Laurent Pinchart , Maxime Ripard , Thomas Petazzoni Subject: [PATCH v3 28/46] media: sun6i-csi: Get mbus code from bridge instead of storing it Date: Fri, 11 Mar 2022 15:35:14 +0100 Message-Id: <20220311143532.265091-29-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220311143532.265091-1-paul.kocialkowski@bootlin.com> References: <20220311143532.265091-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220311_143633_401668_B87E8713 X-CRM114-Status: GOOD ( 13.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Another instance of removing a duplicated variable and using common helpers instead. Signed-off-by: Paul Kocialkowski --- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 18 +++++------------- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 1 - 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index f977b89dcea2..12c02408d18e 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c @@ -17,6 +17,7 @@ #include #include "sun6i_csi.h" +#include "sun6i_csi_bridge.h" #include "sun6i_csi_capture.h" #include "sun6i_csi_reg.h" @@ -455,20 +456,20 @@ sun6i_csi_capture_configure_interface(struct sun6i_csi_device *csi_dev) static void sun6i_csi_capture_configure_format(struct sun6i_csi_device *csi_dev) { - struct sun6i_csi_capture *capture = &csi_dev->capture; - u32 pixelformat, field; + u32 mbus_code, pixelformat, field; u32 cfg = 0; u32 val; sun6i_csi_capture_format(csi_dev, &pixelformat, &field); + sun6i_csi_bridge_format(csi_dev, &mbus_code, NULL); - val = get_csi_input_format(csi_dev, capture->mbus_code, pixelformat); + val = get_csi_input_format(csi_dev, mbus_code, pixelformat); cfg |= SUN6I_CSI_CH_CFG_INPUT_FMT(val); val = get_csi_output_format(csi_dev, pixelformat, field); cfg |= SUN6I_CSI_CH_CFG_OUTPUT_FMT(val); - val = get_csi_input_seq(csi_dev, capture->mbus_code, pixelformat); + val = get_csi_input_seq(csi_dev, mbus_code, pixelformat); cfg |= SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ(val); if (field == V4L2_FIELD_TOP) @@ -739,11 +740,6 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue, if (ret < 0) goto error_state; - if (capture->mbus_code == 0) { - ret = -EINVAL; - goto error_media_pipeline; - } - subdev = sun6i_csi_capture_remote_subdev(capture, NULL); if (!subdev) { ret = -EINVAL; @@ -1067,8 +1063,6 @@ static int sun6i_csi_capture_link_validate(struct media_link *link) struct v4l2_subdev_format source_fmt; int ret; - capture->mbus_code = 0; - if (!media_entity_remote_pad(link->sink->entity->pads)) { dev_info(csi_dev->dev, "capture node %s pad not connected\n", vdev->name); @@ -1100,8 +1094,6 @@ static int sun6i_csi_capture_link_validate(struct media_link *link) return -EPIPE; } - capture->mbus_code = source_fmt.format.code; - return 0; } diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h index 02bdf45f7ca5..3b9759e1563d 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h @@ -39,7 +39,6 @@ struct sun6i_csi_capture { struct media_pad pad; struct v4l2_format format; - u32 mbus_code; }; void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev, -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel