From patchwork Thu Nov 9 16:34:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 163498 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp560538vqs; Thu, 9 Nov 2023 08:41:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0RHj0FMPRg++8yeqbXV92FXn+dELJeBOWzpTONgILZptthJBQvLnUtuedAGUFuqsaqGAS X-Received: by 2002:a05:6a20:8f29:b0:172:eda5:36ea with SMTP id b41-20020a056a208f2900b00172eda536eamr6475221pzk.7.1699548102438; Thu, 09 Nov 2023 08:41:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699548102; cv=none; d=google.com; s=arc-20160816; b=hAVVFPTNr92JsV5jZzIitqP3imZ4Ij85ph6roQkFZ9xkZBRkusd6FEO3lj2L0OyS4I mnVR62noxiT5CC9ga05z1HWYGS5XH5fMVY0h62Lx0OZK4jSH7gd0cT0h6iVSe5TQjCmN WAD8asSeHR1KLSNRVIhxr1miUZhonW+4sWRWWjGOmoPlxJ+TLZXW2W+O6GAE3t7kayk7 tE0OmGRCYJBqVm7VyHs1xTPQ1OqY89nDVbx1Q6PFPu4j9KZneq18rXVPe01go/Cb5nCE LuQ3TzL+OPkSHXdrYkrX01FObBRej5/+NU0PP8zbnOm1cz7hL3mKrov46MjmgdY29z/H +q6g== 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=+fVDZ9548ij6RrHBZZ1umTUIm9WD1qTw3ZAOz/aG7Jw=; fh=cwryVCQqEdRCHITmv2FXSmi3tLYo/ZJ2mgDWbxSfuFo=; b=b5fgLvRHEocM7/TANr8ojrRRt15EOol0nRPLEdj+Ku7aHXgLwJpz6ckr9AJ56oa2VM lAPOo1Yy8QkDUgpMEYMh8XbQdr6MDzydj4E4Tj+BqBFOmu3zYLLNoL6yFobRpsXn4QxX KqPWL/ri2tkFTW5/nOHeQ12P49cTV/RuXG0/BbzE9xb65Zqtq4AqdvOYHLzR8bNZ6Qor 0wfXZ8RPuHQGy+KlWgvHyLesCoQc0As9PpHPlP0Oak4N8XP5XvkcvEWl8oEQJurbJywk akXCQTxyyb553V62xAPUpULoD7tytjaD7iZwPpdagjRd6/wqBAkIJHUWN/q19+kyU6KQ q3OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="i7xor/DT"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id u33-20020a056a0009a100b006be322191dasi17190943pfg.140.2023.11.09.08.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 08:41:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="i7xor/DT"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 9650D808D285; Thu, 9 Nov 2023 08:41:21 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344772AbjKIQkM (ORCPT + 31 others); Thu, 9 Nov 2023 11:40:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344753AbjKIQjZ (ORCPT ); Thu, 9 Nov 2023 11:39:25 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 593ED3848; Thu, 9 Nov 2023 08:38:28 -0800 (PST) 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 madras.collabora.co.uk (Postfix) with ESMTPSA id 3DFBD66076B3; Thu, 9 Nov 2023 16:38:26 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699547907; bh=NppHGvNMzHpeRnryqExvoNEtSwathlR3U98iRKn31sU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i7xor/DTJ1HNHWgjz51eI96QO91oXdYe8VGOhJ5b4tQRdfWTVn6Nsw3D1jgU/TLvC jZibvjE9X2vs80fvj8IsLyE/2H9qHE7Vn9XtQmhtkOZA3k6XqGtTKVYCt3RT9uClN/ GyR0blOiaGfwZcksojyLH4kp6bzc1GPB1ST6ewA9nau8+d348dVMhD05AV57/UBBv6 jcUKh3XvqfKmpBNo2z6tui1SEfOmEzQuUyGzu+TDj2AOQhCld2dT9yvXiWHgGscEZ1 NjkbqKKz6FSnf9hO1v1+JkVvLBTzSFy0zhMRnPCDwuKm7+wAEz+UxWGBOJ9Us0AtXE IE0g9XmMWl8fg== 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 , Andrzej Pietrasiewicz , Antti Palosaari Subject: [PATCH v15 41/56] media: usb: hackrf: Stop direct calls to queue num_buffers field Date: Thu, 9 Nov 2023 17:34:57 +0100 Message-Id: <20231109163512.179524-42-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231109163512.179524-14-benjamin.gaignard@collabora.com> References: <20231109163512.179524-14-benjamin.gaignard@collabora.com> MIME-Version: 1.0 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 (groat.vger.email [0.0.0.0]); Thu, 09 Nov 2023 08:41:21 -0800 (PST) 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,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782105351277072287 X-GMAIL-MSGID: 1782105351277072287 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 Reviewed-by: Andrzej Pietrasiewicz 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);