Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp4261881rdb; Thu, 14 Sep 2023 17:48:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHopT013tUMkcglfQLoNuZ/XuGL/g6UIilOFRQOg3AcHhOToIGQOwsTgC7gYBhvutHWIvLt X-Received: by 2002:a17:903:32c3:b0:1c3:f764:8428 with SMTP id i3-20020a17090332c300b001c3f7648428mr296185plr.0.1694738904531; Thu, 14 Sep 2023 17:48:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694738904; cv=none; d=google.com; s=arc-20160816; b=m1E5JKHQMZt2FzGFyjEeK9Ki1OUuwZ5tEjllFa1wt3896ghIE/dCMj9YHBE13pAzqn RZ1tKb3KfkWmkdvUOqWlV4eumhBGfX1vRDgMOQsYCnmW0yNPDXLNavNaTZJuRxvE52WR VPBKhvUHaC5BoD99Cu+iaFOE8mchVFVyX9cwZcj/o1IynExeMIBr0MzojyPZDmBLNltz NJeTAyZazzAjpQjKoA5eI1m2vqzm2w/FfmJvhqYDTUHtUNzpVJq73ukln6nXQlqwKrDK bnTDjk1iZOemtNa5mJlYtdWTjrM6WfcMt8/BFefyT87ykAqaiKzOOz/sblI7eBI2QLoo EKlQ== 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=kRY1Y8UmuB3bOAVn1DjviZOqkQmeQ20ZSWWBbzh2Ejc=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=sRwXz4w733witF6s3rcob/mFmG3H84DS7PPOPYZybiSt36nEQLqWhqUPH/pK76Tsi8 n1SgmLqqd6AdouviBUNU7I2TjtFnzX3bwq1gJd9wFWySUvWZecPWRoV8rQrFf3bwUzIe Or4zVtCOfEE6Pz1vlVFxuaQbg6IKwBkaFzXDfb03eyA6TArJUe9AqAeckUPj0rqOrM+U PzdobP0u0usdiJvmnTDQH0GxmsQJ1sjS1cJ/jsfxs45AR+y+jCKd14NaXZDxQ2HCiyC/ mr5re+he+aLQdvPEBOb4OHXhxW7J9Y82lKCS94+jaKJK5FxkWJoGx0VdQD2UAyf/5RhJ 4HuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=HGrzjpCp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id b12-20020a170902d50c00b001b8c6890612si2603483plg.594.2023.09.14.17.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 17:48:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=HGrzjpCp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 03D9A85C4D73; Thu, 14 Sep 2023 06:35:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239693AbjINNej (ORCPT + 99 others); Thu, 14 Sep 2023 09:34:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239212AbjINNeC (ORCPT ); Thu, 14 Sep 2023 09:34:02 -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 3AB152108; Thu, 14 Sep 2023 06:33:45 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:36f2:37bd:ccbb:373f]) (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 A9FD66607378; Thu, 14 Sep 2023 14:33:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694698424; bh=BcQqOPN9BFM33EPpszUjysR3LWc4nekHpVvypyNeDb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HGrzjpCpmFxjKl+xk12MOrY+MAGIB4u3LD8uzE5j+yG7VVUQIygb4veFQ1xCJm2qN 7N6Tamio7lxOVD8pfP3gE5v7dD/QnlDk4KY8kejzl3Uo1uBCYl5lQO1D2EKwZ2ub9Y LsMZl7uTJvHisiPba1wwyGF1/Bm040tvPT+fpBf9l94FVfVavC3Prnf5TqF+dz3FVR VhZTziEGD29c1Z47nVHkMzJHfNDvohrqsrqkAelEfBTjRWeqbZFDfPxR6z5eo4TYlL n8okpZR62/R9k08yiq/rRBS/x7JdONAbNeIjEb2VEESBf0BXjS9Ww6GjCSrbAIh8DC ROYWEhkR+lq+w== 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 Subject: [PATCH v7 24/49] media: pci: dt3155: Stop direct calls to queue num_buffers field Date: Thu, 14 Sep 2023 15:32:58 +0200 Message-Id: <20230914133323.198857-25-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914133323.198857-1-benjamin.gaignard@collabora.com> References: <20230914133323.198857-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (howler.vger.email [0.0.0.0]); Thu, 14 Sep 2023 06:35:01 -0700 (PDT) Use vb2_get_num_buffers() to avoid using queue num_buffer field directly. Signed-off-by: Benjamin Gaignard --- drivers/media/pci/dt3155/dt3155.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/dt3155/dt3155.c b/drivers/media/pci/dt3155/dt3155.c index 548156b199cc..d3abb0e093c1 100644 --- a/drivers/media/pci/dt3155/dt3155.c +++ b/drivers/media/pci/dt3155/dt3155.c @@ -126,10 +126,11 @@ dt3155_queue_setup(struct vb2_queue *vq, { struct dt3155_priv *pd = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); unsigned size = pd->width * pd->height; - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 2) + *nbuffers = 2 - q_num_bufs; if (*num_planes) return sizes[0] < size ? -EINVAL : 0; *num_planes = 1; -- 2.39.2