Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp3211856rdg; Tue, 17 Oct 2023 07:51:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIaqN4Qejs4O1P+MSqMsCBVXWiNcTQWUrDYDnivO5RALpC0YWb19Yai0l2oviNc7HmTwsx X-Received: by 2002:a05:6359:100e:b0:145:707f:ebe1 with SMTP id ib14-20020a056359100e00b00145707febe1mr2349841rwb.12.1697554294873; Tue, 17 Oct 2023 07:51:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697554294; cv=none; d=google.com; s=arc-20160816; b=vdWzw1ymYkMB1+YT5FsHdwwmqH5UVdQXHebs+fLNsfFm1+9PfgUsPhqXXh7aUZ4unw QWUoDBmRzEjnbfH1scoRNcgdMEJMi3k+R3B/SGpI9Gr3fqeeSGMcDGqS/5DAPqaJXSFg r2XV/chYbLZxDXWfFnkJ2Ax260TACZbDxWeMozmN3KQnyDQCy5nFHRr62l2iY1/nvHA6 9yxb/5g2szgC0tTqPHbkfKcMy1SpMjXYG1O/A+cNeZ2545Kvtsx4Q3SLEpaPKyngnikv H0IIaYyv3hgVTKRBjMbzOUVv8VIYrWZ3MmlbtpNAfZzEx5j9LJUF4coohPGr789N3iZm wDTw== 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=6naI9jAgWYBGhWi1qqi3RabSUM4tX/YeV1rNn+0zlZU=; fh=p0AH8hgimiy85Lh1cXLIqpi5zFbeLa4s8fsQNMmUBzM=; b=fZG54LlSogSH1jGQoXUAP6i/zSOhL51XWPeMbIpeonlbYMnGv9nv6kF36m6YDVieJ1 ZiHAcyff9U5V5E6rNd686OyuRv7QzIoQtI6w0gaUDhklOsBU3m4JGTQR/JHqMjCAFM3R I6hBNOBStc9oNRSmnYZ1C5e26YU2CGxn8ZAFSa0Ltktf5qa/KRj8MVdq03ZjQwAU7O44 Rjc1CfvBC8jXobfmFw3AQFN1F5B6CytQAruEPHQ5cYViiN931hNiUMjewwOSWWka1i/s ygIOnHShVDI47ckzDQN0EJnFt4vvCRWy8omjOJRGis4o+bGCGXEIL29lejQr46lOb43g sxqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FTrfzkYO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id k27-20020a635a5b000000b005859d13f276si1841945pgm.569.2023.10.17.07.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:51:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FTrfzkYO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 2D28380295BB; Tue, 17 Oct 2023 07:51:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344470AbjJQOuX (ORCPT + 99 others); Tue, 17 Oct 2023 10:50:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344217AbjJQOsY (ORCPT ); Tue, 17 Oct 2023 10:48:24 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4620E10E; Tue, 17 Oct 2023 07:48:15 -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 B18FF66072F4; Tue, 17 Oct 2023 15:48:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554094; bh=+SrUe883wLqq7v9G8MLuRZrzPHfSobRjkRT5Sxaur58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FTrfzkYOUFEaypOirJmchtUF+AvoupwvBQrV8f1KDKYHMxDadGxipG60O9gy9GCnf ozQGGLYmXJXb8lJEt2hyOPV/6PTCt/WdcNrpZTRY8hDOreYXS3xRJBCMmvHnGOKFj9 fG8oY1CRVJngNts00z3d6dOLpbgNJJKAyue9Ub0LtwycDZy+hXI9gAkGO0Z343TFIu etQ6pS+2yfwiWD53upzlrn1TMULf8oxHiD9rfKL8kquK8slae2FkzZtTL5VzL6RBl8 64Ug6UOByQDoG1JJ4GrMA7ZI3iuwxMUhj+AWmhSJOf1fn/4UseCir+2vGoGEiEIYIc ifU/87Db9cRMw== 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 20/56] media: dvb-frontends: rtl2832: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:20 +0200 Message-Id: <20231017144756.34719-21-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 pete.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 (pete.vger.email [0.0.0.0]); Tue, 17 Oct 2023 07:51:19 -0700 (PDT) Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. Signed-off-by: Benjamin Gaignard CC: Antti Palosaari --- 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]); -- 2.39.2