Received: by 2002:a05:7412:f690:b0:e2:908c:2ebd with SMTP id ej16csp326571rdb; Thu, 19 Oct 2023 05:57:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDO+mNLM/3qsvOpuwagJeVx9Nb3eYUF/2ZzJv4BzVBiYNdTLmAvUN0oS7Z381V1cFEzEAu X-Received: by 2002:a17:902:fb0d:b0:1ca:8419:1854 with SMTP id le13-20020a170902fb0d00b001ca84191854mr1895837plb.21.1697720226113; Thu, 19 Oct 2023 05:57:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697720226; cv=none; d=google.com; s=arc-20160816; b=AeEAvpge6YVKBIF5ECSbbjruyJKEe5ptSv3p/LNAcIIQSaXy5hZoMLBJfhqlG9ip2V +Gr6PJoJhaHIzqlquANZez7lsX1rEs5AoNU2sum1+ZtjQSLwSMiNaFvq1JnU6xiM9F+w ARbTIT2OGLQROhWoEu9r/gDKdh38HK2pry/HcvqN8eYVW8LDnaPCXn4yMgM4ZeM8qrOM EjmwZ7iCQQmhKaJJU5Q+arKjgzgm497tVWulcvakHZL9Fh0NUGKZkKgtPtTKCSk/4/X3 P8cTA8DH4ixG8RFxAq7IqP1HdIG55CqI9ajgTZQYp/UcNZlkh7rLVug9+UCwARO3hsiX H45w== 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=RNH8B9gPylxTtM01bKtOlQf9akbpmUzdDHvgh+kzWPw=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=EqlvMI+DbN2dPdWexOCe4HhO3iCjKTyuER1/MHdaUoivP2i2CR/C5I2t/iknaHCutj yRcffepvLEqyeQeEdIIljAXveZ1oNzzbrpCYk+NkwVMttx/7mGM4XLhquhrrVRrRo+0h TeAHa4HXftO5FnNqveC0F53krTP5XdZYVx1OVyyvWAfzV3LrAay2pQCrt15cRUJ6spLw u0LTUpGMeGY4M3JRmiC4uBq4NBXBYalDYTGd83NamE1DHPECaaV+XaTamOaBVUg/AVpG h6wA7TlJDyoZ8TWmrRF6G1CXD6Fi8r23aMhfVDen8MlxUUIA6G/+MeuJkcJXMvnbtyeG aAJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="kcvKob/9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id y15-20020a17090264cf00b001c61bd9db5csi1941785pli.317.2023.10.19.05.57.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 05:57:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="kcvKob/9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 01A948093D7B; Thu, 19 Oct 2023 05:56:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346229AbjJSMzc (ORCPT + 99 others); Thu, 19 Oct 2023 08:55:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345956AbjJSMxS (ORCPT ); Thu, 19 Oct 2023 08:53:18 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1CCCD61; Thu, 19 Oct 2023 05:52:53 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:ccea:1fb5:34eb:239b]) (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 014CE6607382; Thu, 19 Oct 2023 13:52:50 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697719971; bh=KjApYJIBwjQar3zDS5eK/9rcHF3+Kx68u3lDScmGVYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kcvKob/9JBRvVHTLOOOjKxOfUSntTeKcqSHyXPZc/HiO4dW78FIX29uqGvA0KmzQl LhsQBcSzP7OKzT/4x9Z7+av++aoeAbmheKpbgfKo3Kq20IW5cUED7axibzT94EqRnG OCwyhpvfpDNkJhKu5VdjBRfVoOIsJJXwaSEWPo+rZqaURnwb0yJrO128kZetbpPPb6 90dUMSdZ7rLE2kTIMjtEKXqyqCz0sQh13lMemFnrQefzrK4ZwUBtFLYso/WDZNKELL hFTAOOYEJfSEq1p/wThdz8vPKiVggYoZ7af8QOVs/iHHtt5aDndWw3NEHaHdLDPDQ6 YEIirX7J9hpaQ== 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 v13 39/56] media: usb: airspy: Stop direct calls to queue num_buffers field Date: Thu, 19 Oct 2023 14:52:05 +0200 Message-Id: <20231019125222.21370-40-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231019125222.21370-1-benjamin.gaignard@collabora.com> References: <20231019125222.21370-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 agentk.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 (agentk.vger.email [0.0.0.0]); Thu, 19 Oct 2023 05:56:16 -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 future. Signed-off-by: Benjamin Gaignard --- drivers/media/usb/airspy/airspy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c index 462eb8423506..e24e655fb1db 100644 --- a/drivers/media/usb/airspy/airspy.c +++ b/drivers/media/usb/airspy/airspy.c @@ -482,12 +482,13 @@ static int airspy_queue_setup(struct vb2_queue *vq, unsigned int *nplanes, unsigned int sizes[], struct device *alloc_devs[]) { struct airspy *s = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); dev_dbg(s->dev, "nbuffers=%d\n", *nbuffers); /* Need at least 8 buffers */ - if (vq->num_buffers + *nbuffers < 8) - *nbuffers = 8 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 8) + *nbuffers = 8 - q_num_bufs; *nplanes = 1; sizes[0] = PAGE_ALIGN(s->buffersize); -- 2.39.2