Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp4132681rdb; Thu, 14 Sep 2023 12:47:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRLPJmCry55n284eNFlbFvZQ9O/e/B2aLzaAH3qyfGU+vangJCkN6EwDOIwzhj3pPDGB5g X-Received: by 2002:a17:90a:db8a:b0:268:798:a28b with SMTP id h10-20020a17090adb8a00b002680798a28bmr3963083pjv.23.1694720827921; Thu, 14 Sep 2023 12:47:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694720827; cv=none; d=google.com; s=arc-20160816; b=CF+vn2nIuPFQZpj47d9BDRpF8Jb2EZoG6wpkuUQc9ezDbXPZimo17nuBYPf3lFLXkK d4nQ2QRinpVL7/ruWPGDItmD1lM6vK5QaS9KIGWqEwMItwUfVwAdBsKg95zXIC8IBZ+P DIsJyITlLwD4DbiXM7b61Wt7Z3EWKvCadbpQ7E4dW2TZFO+ek3FElh/Pcf8x7rMy+s0H zYLjN01DVe7SVKzJnTKysDnB1D9BSIt3rA6Pnd+0XELO6Yn18va7FyBBLVC8wflzcG/c KshwfowOkl2AIZ0d/sBMZT6sY/F5BVatkZY/6U+RLU9HOF2JNR5BIvYunxosXW7lBPqX KkXg== 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=WfkYHk/trVkAjRfanFzeHGLwCwhCkoy3XYc/vqt+hgI=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=ZSP3i/BeiNSUvVEObs9p6gnaiS++iJTGGSbhfp6kq51dC0rwzoZdBWvoz/Mrtpy5E4 uYBx2+s0+u0OcZqiklZV4wHdoq3o8t9xEvcCJ0Jm8zYstvT0syt0gTQtrRChNiJNfdP3 jpSJKmXb0hsFPiBkeOXWACmfZDEgUfN+hAm8rE9VMqh325W/lA3/8H47FM52p89G1YT0 Mt/rWg4m4xUr/AW2esGjlbW4SCClNJdtugLMWAXTGtlRmZjZWVoifjWaZQhRCuoY3d5a DzuozIe1JDKgW3dkv95E+ZZ/o9abJoHitciX3s7ASavjJlXd6DdRRuTBc9bwiL2ri5/g q8Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FtrDiCcT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id ng7-20020a17090b1a8700b0026376acd6fesi2388726pjb.22.2023.09.14.12.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 12:47:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FtrDiCcT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 499DA8268120; Thu, 14 Sep 2023 06:36:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239039AbjINNf1 (ORCPT + 99 others); Thu, 14 Sep 2023 09:35:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239412AbjINNes (ORCPT ); Thu, 14 Sep 2023 09:34:48 -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 1A5C32713; Thu, 14 Sep 2023 06:33:53 -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 84CF3660738F; Thu, 14 Sep 2023 14:33:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694698431; bh=jspqya66/sOJC0Q2CfHFiQMFqhK2LjIJM71tuArTZQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FtrDiCcTc86G8WNqSS69XZsMirB/zhQO0FMh1ndMQqet0ySMzvbnp6ZMe9LwCMmjC rsCNvhVjgbWEaH9oFqRRpfRtLJr9qsGMZUsKFtGLzMnDO7R7morG2c4e67lznT+lmr zhZ/EvgX3pDFC0ZsZ6MfebySFZNPp6YlHWQY0CZu+8K0v0M3L8GTnWLtjkzRRq4/P/ WqeBftrKoHcqEJ5G9JvmfgBtzISw9SVEOjnnlkmVRM+fVyx4XQMNHVNHL+52nZtpDz 6W/miDgFF3JRzviElCG6KYvy4nerjl4SVMzkNWBcl5Grj4BfC08OMselt208df+7Nv mn+7+f4l/k6lQ== 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 39/49] media: usb: hackrf: Stop direct calls to queue num_buffers field Date: Thu, 14 Sep 2023 15:33:13 +0200 Message-Id: <20230914133323.198857-40-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 (fry.vger.email [0.0.0.0]); Thu, 14 Sep 2023 06:36:33 -0700 (PDT) X-Spam-Status: No, score=-0.9 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 fry.vger.email Use vb2_get_num_buffers() to avoid using queue num_buffer field directly. Signed-off-by: Benjamin Gaignard --- drivers/media/usb/hackrf/hackrf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c index 3e535be2c520..9c0ecd5f056c 100644 --- a/drivers/media/usb/hackrf/hackrf.c +++ b/drivers/media/usb/hackrf/hackrf.c @@ -753,12 +753,13 @@ static int hackrf_queue_setup(struct vb2_queue *vq, unsigned int *nplanes, unsigned int sizes[], struct device *alloc_devs[]) { struct hackrf_dev *dev = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); dev_dbg(dev->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(dev->buffersize); -- 2.39.2