Received: by 2002:a05:7412:8d11:b0:fa:4934:9f with SMTP id bj17csp655262rdb; Mon, 15 Jan 2024 09:08:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IH3JmYMONZ15QvddwDnrfAdJhND0lQ6t8UODzBo+6oHn29vdN4VClrngXG0XFezYQIsQD/P X-Received: by 2002:a05:6402:5248:b0:559:7199:8868 with SMTP id t8-20020a056402524800b0055971998868mr218110edd.101.1705338532340; Mon, 15 Jan 2024 09:08:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705338532; cv=none; d=google.com; s=arc-20160816; b=muO2YPg4c9LY7qPllskibEcNqesvGzOrwHQHHx8dLfwdrkuUGsMg/jy8ZW5vOmvwTF 5ppM/X9LOsPQEZAumEaKsh8JtoC0YbpDCmG1OY0ab6SNajWJa9c7gqP1YujPgXSKMhHI XrEyRTQUx0uMikCm7yluOCTWIXDsOgyOZFI+1cd+c3EiD39AjyOc1/JXsuTboFMcSHgt ULaTr8Sw+pIoOmuJEQm9fwolPWUtfuSYQL+OOA+NDw9ymMSIZb/8CPieJ6mw9c0pI0Cn ClhsaZl5/DuwHuNo2P/zYDGhomn4k0fnthMd/QhPFCBKLJd9iNzgXf3cyMusb/BxkKqP 7crw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=uRrP83h05JFugxQ8XNf4n36wAXRuv1gxK/x+epL2utQ=; fh=LdiJwbrWYVC2ifCheW6JG8D6wIWB7N/zitd3utSpJWI=; b=FWB0ZTDMwPDjVdop8hNDjzw2GAz8Gu8KzVY2XQpNBhZm5fwoTfvDAYujI2fkJWKfP9 4AmZ+TEYKHOPZnjUKdHvUPsK7PMrvoiM7E8J51gYLqXqQTdfsqMZ0Y6BW2v5I8Wxpjba O3QT/yrEfwjH0UE3J7WDjC5N+74XHcxQga2AbObCDNcSfWtggwfISfi1XE1Wp5x8jJmm PPEzrB0SHspT13EYGGgb+F8EGrJt8rreSSRt35p+nODf8jEH0SCRgC5vqnV5L6AGAWm1 1tC5MV3o+xRv14owoRdw6t6gYoqgGhUNyDe4wddximKsEH4IbO+XL+KXJnKuWSZ204qg lWMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NlRyHxxD; spf=pass (google.com: domain of linux-kernel+bounces-26291-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26291-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id i9-20020a508709000000b0055825d60eb5si4043532edb.183.2024.01.15.09.08.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 09:08:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-26291-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NlRyHxxD; spf=pass (google.com: domain of linux-kernel+bounces-26291-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26291-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id E606D1F22B59 for ; Mon, 15 Jan 2024 17:08:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 663B418036; Mon, 15 Jan 2024 17:08:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="NlRyHxxD" Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 403BC17C6B; Mon, 15 Jan 2024 17:08:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1705338512; bh=GZjv5jDQUKVKK/gKAMres/tfnHPmalotCq2ySiKnMws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NlRyHxxDgXm4JkpMMHu9Hn6t1+3bJEXjlNgb0dRykO8BExbN8BlvZ8yU637hxQWuQ 6vAMIGOwMwQqy0Yct/lcgOFCK5Ke6JXmLGcCgejbAPmbwFQ55HNBvivsQT8tB2oWEk IGIc7m25/MEgq8ufmtFwqQysyyRCxjt9AjUwo1YwGxBobkN8b4d+4qzNLub6Os/vET jG7iUgjCMziGmI7G+vBHGHzs8RtjJ0c36b+G3vwiehr52EnlIBX5iQHbXtf+mO3cXt qf7cE8+Fu5XQVe5h5+PvBdMZta2Vq1DCcZh3JloEKkDd9hojL029dFfRjy8JWt3gdS fxuLBkIcIhUhQ== Received: from benjamin-XPS-13-9310.. (cola.collaboradmins.com [195.201.22.229]) (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 madrid.collaboradmins.com (Postfix) with ESMTPSA id 186CD37813E4; Mon, 15 Jan 2024 17:08:32 +0000 (UTC) From: Benjamin Gaignard To: tfiga@chromium.org, m.szyprowski@samsung.com, mchehab@kernel.org, hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH] media: media videobuf2: Stop direct calls to queue num_buffers field Date: Mon, 15 Jan 2024 18:08:26 +0100 Message-Id: <20240115170826.214519-2-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240115170826.214519-1-benjamin.gaignard@collabora.com> References: <20240115170826.214519-1-benjamin.gaignard@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 future. Fixes: c838530d230b ("media: media videobuf2: Be more flexible on the number of queue stored buffers") Signed-off-by: Benjamin Gaignard --- drivers/media/common/videobuf2/videobuf2-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 41a832dd1426..b6bf8f232f48 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -989,7 +989,7 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory, bool no_previous_buffers = !q_num_bufs; int ret = 0; - if (q->num_buffers == q->max_num_buffers) { + if (q_num_bufs == q->max_num_buffers) { dprintk(q, 1, "maximum number of buffers already allocated\n"); return -ENOBUFS; } -- 2.40.1