[v15,20/56] media: dvb-frontends: rtl2832: Stop direct calls to queue num_buffers field
Message ID | 20231109163512.179524-21-benjamin.gaignard@collabora.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp558786vqs; Thu, 9 Nov 2023 08:38:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IHrR2IO/Au+MJMQLMKucvDsNzYNFJtnqy/W+aLUxlw72XpBZPC6lAjpox8eKsP6Yil4jdgA X-Received: by 2002:a05:6830:448d:b0:6c6:5053:66dc with SMTP id r13-20020a056830448d00b006c6505366dcmr6998282otv.21.1699547920446; Thu, 09 Nov 2023 08:38:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699547920; cv=none; d=google.com; s=arc-20160816; b=RQXI72bvLDmDCTfwI69pv+llcCE6rB8VHYwuilS6cpPJbrzONLsYgg9xleyxEugN8H 2An4/5UkIRuBJstNF/UtaZh+Qsgao83GT7F9Ai+raa9gytDecUa7VwgBondQDaIriflx fu0qtuzsW7Exr8qZfS4AOlYAG5JL5UwLWJsSUQoUrjfpZ4jYBzQ/sFvLOiS+FRAUnpc7 xt/OdbqhnEMV7R5B2BXBsg0eLjs2lZQC4A9nna27EqJN2Uurll2B7hte0h3sFkg1rCmu YWrl0KriYOIhWN/4yobCBrTgmuA3gVoRHjpgUk1QDWMzs5jZ0FrIurbbe3dOoYs1gGDZ L+XA== 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=FlVpk/v8Chc2a6AJegqTBSpHm2hql9K0z/Q5hqKtV8M=; fh=cwryVCQqEdRCHITmv2FXSmi3tLYo/ZJ2mgDWbxSfuFo=; b=Umrj2akbq4qVSZckQAzUk33oEIn42e//sZedlZW5oD5a9GXMYZmfcAwh4akxFITASL FsHpx8qxirf0KTiAGwrY1uWrgefIZgAjnjIu1V/3dK6ewSwrxiHbRTSJrT4Vzsu8z7sP 1eOYu2HvM99FdMaSh77pZ2o9dUFReyLjL8aTnA030xqf7K0qpP7xqS2arVEjbguerZdK pYTllubCg0KmS+niwaMhA7Pi9gr3IGTZgHy8VWzUFdDffp80Ji4+Wt42GkTK0IedjLew S0QmuHPF3dbtFAOAaKt2MCIk8reFY3QKy6+QXDN+wI0CPrngaE4TYU6HtM1I7IoFIkUB FKiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=bxpn1yEW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id k24-20020a63f018000000b005775e2a7951si4511364pgh.345.2023.11.09.08.38.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 08:38:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=bxpn1yEW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 D7A04831F436; Thu, 9 Nov 2023 08:38:30 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344626AbjKIQiI (ORCPT <rfc822;lhua1029@gmail.com> + 31 others); Thu, 9 Nov 2023 11:38:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344256AbjKIQh6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 9 Nov 2023 11:37:58 -0500 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 16D233869; Thu, 9 Nov 2023 08:37:51 -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 F04C166076AE; Thu, 9 Nov 2023 16:37:48 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699547870; bh=FGosfQkz7xDt3TH8JNApENUZqKlKqY5ctlOL3LauTLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bxpn1yEWIuMMw47RbvyzRY+B1Nq2sbyshmfEU2vk3UJFJrcdElM/dEm+mzPtO8mgR 6ZVRQ7jXCVw5BqTkK6VGz7+qYoBVgpni8NcUxaykkZUbJCsEahIZkT5ZH6EwOm5MWB xlCKgCe2x+bU7IgSVG8q34wjZMw6vCV6fFTw1FI0hk1XgGqqtSeociY083FG3DCkII NX+vGMZCirJ3Qrq6nzpldzcFhDC/xdFIvhFEzsYndxVujyt4U++PvHj4Cjr7EYl8Hj pZNc2xP2vg1LGy+ahJeZTeIVEq1AMrvS1T4FB3ZE+gELYWF8l15mdmsLgbfz/7zMg5 ykf5cinJr/h7w== From: Benjamin Gaignard <benjamin.gaignard@collabora.com> 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 <benjamin.gaignard@collabora.com>, Andrzej Pietrasiewicz <andrzej.p@collabora.com>, Antti Palosaari <crope@iki.fi> Subject: [PATCH v15 20/56] media: dvb-frontends: rtl2832: Stop direct calls to queue num_buffers field Date: Thu, 9 Nov 2023 17:34:36 +0100 Message-Id: <20231109163512.179524-21-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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> 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]); Thu, 09 Nov 2023 08:38:30 -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 lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782105160458882256 X-GMAIL-MSGID: 1782105160458882256 |
Series |
Add DELETE_BUF ioctl
|
|
Commit Message
Benjamin Gaignard
Nov. 9, 2023, 4:34 p.m. UTC
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 <benjamin.gaignard@collabora.com> Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> CC: Antti Palosaari <crope@iki.fi> --- drivers/media/dvb-frontends/rtl2832_sdr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c index 02c619e51641..023db6e793f8 100644 --- a/drivers/media/dvb-frontends/rtl2832_sdr.c +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c @@ -439,12 +439,13 @@ static int rtl2832_sdr_queue_setup(struct vb2_queue *vq, { struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vq); struct platform_device *pdev = dev->pdev; + unsigned int q_num_bufs = vb2_get_num_buffers(vq); dev_dbg(&pdev->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); dev_dbg(&pdev->dev, "nbuffers=%d sizes[0]=%d\n", *nbuffers, sizes[0]);