Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp3212666rdg; Tue, 17 Oct 2023 07:52:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEcG6Zp3jfyVVHSeCyXInRL4VgNNigBPoIpsrgnlIwTWeqTU3w/eFG3aXAJqk8eRVRQg3V8 X-Received: by 2002:a17:90a:bd0d:b0:27c:ecec:8854 with SMTP id y13-20020a17090abd0d00b0027cecec8854mr3322861pjr.7.1697554378053; Tue, 17 Oct 2023 07:52:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697554378; cv=none; d=google.com; s=arc-20160816; b=QKMrhobouXVGVzIA8QR0k2FHo6FauF62Bnwbti9Ssh+9ktsqUEQUMPhXNAPL+0XUjq rEApNtP8gO35v6t2PC9LdEyDddLpmJam4AeU+UFETM689h/BUjl1bamOWriVHDRRPPXA jKWfM6Qn1svZstlARNNl6iare4RVDYIX3ZoTxeyQmJjNAnd4gLZJMR1SMUSY1xplb/mW 8CYmkM2Du04ZlENqeEk4QBizzlHQNyFULVjAohLdLNgWIVWnMe7lhpogFJOtYs40xS4k Ay4znKZnKcjC8hoFr9M8a7bNRK0sjnpNbaBEf6s3AQV7cWcKEUBX/ZxRzkINx0d+PH0i ITSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IeqPKrmm0FrVjKt2nFmvyNar1ggg8xkzWgg1O5j1/fc=; fh=O6aRB12iLfQPcoaBoN6ND3UiYcgSMHP3FYKR6EKS/0Q=; b=nQTAYt1UzdUduIq8J6/1S0Hj4BGkXM+G+5lfg5f2OwKWsHn2Wsy4Qmvb4DG42LUKG1 ppC/RFMpINs8G2yov74+hHR/ZrPbED7ThV2+76DPl/47qJWbfV7m4607OzOeVTTSI1UC CiZtxofzoaXg7290OYnwwx+90T1xHOPocHbcjUwcJJ5SExvk7iaBqakGUTOTkvEQByqy TpMPu5s/Spbqs8i1JC0xGdTomkHYBiY4EMfVzlaAH1UMpcghPflcMt3yMuk2ormqa0C6 04t98nGVGjkOgeaSAByT5+e1sYg3HducNivNplS/8FkvlEnqn9Kk4RvccSwWsR7sDlXP wyHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=QqaQsRK+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id lx15-20020a17090b4b0f00b0027cef9ad081si679098pjb.164.2023.10.17.07.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:52:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=QqaQsRK+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 4FE9280A9E37; Tue, 17 Oct 2023 07:51:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344484AbjJQOue (ORCPT + 99 others); Tue, 17 Oct 2023 10:50:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344198AbjJQOsW (ORCPT ); Tue, 17 Oct 2023 10:48:22 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADFA1F0; Tue, 17 Oct 2023 07:48:13 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:7205:da49:a7e8:59f8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by madras.collabora.co.uk (Postfix) with ESMTPSA id 164906607359; Tue, 17 Oct 2023 15:48:12 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554092; bh=vK+TMJznRBSWjc0ShVXFJZhaWsv2b7OPcb28GLqTu0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QqaQsRK+UlCvxbpWzbSKC+l2JRvjkT5F0JSdWyi/7YsfBn/CJQVoMOpW9CynbdPif sqjrsNj0NDFRdfpHlKdilRyt1j1dwa478TNZJbdZFa7+U6QMEfhCNv/BkOWo/A8G98 S0RRA/1TRwH0+kespELs+jCeNQQCyEUPgETWP+yzZ5VsWXM/trD7XsHbNORqpWaUhB fr15V0QPMcTaFlpSfe+PocHDX3mV80CbrjeTxaWVgh/+sNlG0T/dzQA99db9e9MstM 4JMYo8bxoKF6FMvDSramPE9BQoMLCe6hDlsgcZzNBBaQ7KgfPgxk77xSWlaW+Yt0dY RkS3dQnqWBuJQ== From: Benjamin Gaignard To: mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, ming.qian@nxp.com, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Hans de Goede , Sakari Ailus Subject: [PATCH v12 17/56] media: atomisp: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:17 +0200 Message-Id: <20231017144756.34719-18-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017144756.34719-1-benjamin.gaignard@collabora.com> References: <20231017144756.34719-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 17 Oct 2023 07:51:42 -0700 (PDT) Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. This allows us to change how the number of buffers is computed in the futur. Signed-off-by: Benjamin Gaignard Reviewed-by: Hans de Goede CC: Sakari Ailus --- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c index a8a964b2f1a8..09c0091b920f 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c +++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c @@ -1028,7 +1028,7 @@ static int atomisp_qbuf_wrapper(struct file *file, void *fh, struct v4l2_buffer struct atomisp_device *isp = video_get_drvdata(vdev); struct atomisp_video_pipe *pipe = atomisp_to_video_pipe(vdev); - if (buf->index >= vdev->queue->num_buffers) + if (buf->index >= vb2_get_num_buffers(vdev->queue)) return -EINVAL; if (buf->reserved2 & ATOMISP_BUFFER_HAS_PER_FRAME_SETTING) { -- 2.39.2