Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp3212261rdg; Tue, 17 Oct 2023 07:52:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFOztoOjnDnEu+1lSUkls47w1JNvSQsbYtHbsERuUmoIFS+AUI9l/penqZM8RNy1WxufjjT X-Received: by 2002:a05:6870:780a:b0:1dc:9714:e2b3 with SMTP id hb10-20020a056870780a00b001dc9714e2b3mr2694029oab.7.1697554340774; Tue, 17 Oct 2023 07:52:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697554340; cv=none; d=google.com; s=arc-20160816; b=jQqXzlaPfTTb83uSz+e8y21GzKAyKVK9bTtezBOmR7Cs5pVmHbEhYKguX1xVmvH7oe NOeZCZ083/iP4dPhc46XxxcGNwj0quKTVox952P0x1O8ggX97CNeLpAtd+xHesIjVK/z lUDp2Nig+c77edIifEMZaFu8k3iY2EpNUahLjOnFF1fh5aplMTEHN4TEW7t8yDpm03qL QVljkgkWSNuG5m5v2Kjs6gKGmUvDeG9PDNkGQOYFMnXzsQliySaNGaHhc5RBKRGxXNgR T22isNDnXz56U02Z1qAimAn3mcnGZ9U9I9aKDIadS060dDlFGUFpv0yujpGRb12K61hn NZSA== 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=OY1nnmZfc8RwmdQwm8wzqhvoFBBp59TcGjrevbfgfsc=; fh=p0AH8hgimiy85Lh1cXLIqpi5zFbeLa4s8fsQNMmUBzM=; b=OsVuTy9VKtrCIDRQcd63mMiSkNkgN1amft1C0QlpoZ9zHq0ffOamDwUGUaa7UQKW7A 8R51cCM81nsj/in1m23GNIXtCr2KAixsYeEPF6kz3T8hLC6dwMh3X4LdrTiD7mEXAU8v 7I6S/b9tnofysT8yd35/kphAecnltrNLUusAWgACM4iJeM3THTBavJfkCeSD6+ddqVna jh+QN4+Ppq5hfu4madj91getXM+TOGHfNcTai7SO5fS0nMm8eDoh9z7cWlm7zOSzhq2O jBw+CZRMlbmjuIq9ViyCne4iwi/gw7vb/vPYuv/An1+YEcG/yowhFuEn9Y3ZRKAqboJl DWLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=mGJDmZHL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id p30-20020a63741e000000b005b804d972a2si1870039pgc.490.2023.10.17.07.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:52:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=mGJDmZHL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 8092B80279EC; Tue, 17 Oct 2023 07:51:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344630AbjJQOvA (ORCPT + 99 others); Tue, 17 Oct 2023 10:51:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344339AbjJQOse (ORCPT ); Tue, 17 Oct 2023 10:48:34 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3DB3D43; Tue, 17 Oct 2023 07:48:26 -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 E67FD66073A2; Tue, 17 Oct 2023 15:48:24 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554105; bh=wk5FyCWGNx2cAtKViktVclkgN+GPe2+jk4Hquu06z/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mGJDmZHLrlCdnB1gFhkCrcMZmauV6q/t5HUn4WU8MLXq72p9S/IG7tVS/Em0ly3GA U0/o+Kts4ct50nuQ9x1dcHcrNeQqVfemkF0Xk60AdZRW3DG6GTnFwIm8lhJcb3kFnf YfkwrsgeB5IrKfFlrTbLj6avD8ShpAny6DJt4txetIUTkOpS1x/Hk5uR1pgX4ovuS6 ST7+VLAf6Fx9+4l1sCxkgn1Kym6RcKoodgY48GPSWE6pmo4rn41COb53dYr5SzbafL F0FqqdMi5wwv8aVJfdd74rwj6pFx1hWhebXBWZ3s6dM2daxukTnwMujW/NZex8yKAm 539OKQF1dX6gA== 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 , Antti Palosaari Subject: [PATCH v12 41/56] media: usb: hackrf: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:41 +0200 Message-Id: <20231017144756.34719-42-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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Tue, 17 Oct 2023 07:51:57 -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 CC: Antti Palosaari --- 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