Received: by 2002:a05:7412:f589:b0:e2:908c:2ebd with SMTP id eh9csp367067rdb; Tue, 31 Oct 2023 09:34:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHn5S2JbngP3bi8UogtxPAz2fa1fgR2oNiMZigC9BVkYLJvxo1vSJr9Dg+od8BRL/G8qFgn X-Received: by 2002:a05:6871:a4c2:b0:1c3:91b9:e1e7 with SMTP id wb2-20020a056871a4c200b001c391b9e1e7mr16319348oab.21.1698770081393; Tue, 31 Oct 2023 09:34:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698770081; cv=none; d=google.com; s=arc-20160816; b=M/6scZiJ7A4iqDpzy965RaJl98fUCByXIuHuPXFQE63PN9t3GmVzlHW4/Y+lBurEoU 8wn19kqEMQuKgwaQipJj9S4I2U/SQEUivjbe0eg5UcIRRe90FsTqLnQJ1IXEWF32rSko QTTwb4lpAorrQKGl57Ao+Rs+moFdQ6VEmWe4KBY6uxmkaoO2DrrNNDGMmGf7ALLrDq2J 8Gty0ayWly9EcvSNC9gA5b/4qZB2B4X6OCVpqMbThVUfwry0RWKEvWSwiiPrUGsvTtZq RExhLS0wGusXGDeB71WpZFYfdG6+3AqX4D69d+l96XCk3VmnQBsI30d1oA97AMhNmILD 0opA== 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=j9RcbwhCaGvV6sAy6LRbj4ub/UqH4h+UFS0UzrGLFws=; fh=NtNbTLhSppqa/dKQYOuOHDWfpYU65HA4kIMNa2qFe4M=; b=MHxqyAIMb6qIA1w9RnX59m38KwcjZiP0SfPbvDBDb8nO21v5IVZDs7RikJqEc4igRy dyzcKfcr7Fdw5uAQTRBFeyTC0ItbB2IelxgEtpzc0yp3M4REreU+2rxiGixtg9fRAxlR K78PTivzX3whPqjnk+cQhtn0Bob38TE7iJBj39M3VTxmVvi4uG7Eku5VQuYljI35ATy/ nm9iL1wLmIx7hN9Iq5z7Czz4nalVssiVXY7OaajsMghViJixQVaXL0kgYtrERjtfFOso ZCIhDGiSeGtiasAHlmmpUZmxHtITbMA7ljF55IXSpFoEjOnihwzZ4CPVL9yq3KwzzQR4 WANw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=KGDwsSye; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id r128-20020a632b86000000b00565e39e7b80si1203098pgr.678.2023.10.31.09.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 09:34:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=KGDwsSye; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 3C60E804A627; Tue, 31 Oct 2023 09:34:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345288AbjJaQeI (ORCPT + 99 others); Tue, 31 Oct 2023 12:34:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346430AbjJaQdU (ORCPT ); Tue, 31 Oct 2023 12:33:20 -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 48BC91722; Tue, 31 Oct 2023 09:32:10 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:c562:2ef4:80c0:92f]) (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 D37BE66073D2; Tue, 31 Oct 2023 16:32:06 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1698769927; bh=qQNeAhJBC9caR9+SHO5bRaHlsjRbtaBcnQ4MqubG9oU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KGDwsSyex4h//bF3xFiL7LsGvZnB2p5AQvTDn/EOKZq5TV+PEafSVzMB8vvMM5HMK I5Q09T4zvnj5Y6eMgh3Q1rDi7sDv6ManTDoQtW9hk1c9eh5gShBR+evkATdPYaHHsk aWFftRCqYabB+M+sino4qs3ojBc6b+x4jsScac/vXnVxOpq9SXBKC/0xQXe/6JN7xP 1WBKYkKWyRcTRg3lDpNv92DbjcZsmQiAZVpUDVZ6F2xbaF3UPuNCKi1Wb7TyxAM2ms aLZ1vEHUZxRwOKX2fbqX7S+6kcvLIdfGyJq+3DdhQ0LfpB9JOaz9xT9+I2jLEMOvVK ktKuPL3T6vPUg== 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 , Dmitry Torokhov Subject: [PATCH v14 33/56] touchscreen: sur40: Stop direct calls to queue num_buffers field Date: Tue, 31 Oct 2023 17:30:41 +0100 Message-Id: <20231031163104.112469-34-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031163104.112469-1-benjamin.gaignard@collabora.com> References: <20231031163104.112469-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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]); Tue, 31 Oct 2023 09:34:34 -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 future. Signed-off-by: Benjamin Gaignard Acked-by: Dmitry Torokhov --- drivers/input/touchscreen/sur40.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c index 8ddb3f7d307a..e7d2a52169a0 100644 --- a/drivers/input/touchscreen/sur40.c +++ b/drivers/input/touchscreen/sur40.c @@ -847,9 +847,10 @@ static int sur40_queue_setup(struct vb2_queue *q, unsigned int sizes[], struct device *alloc_devs[]) { struct sur40_state *sur40 = vb2_get_drv_priv(q); + unsigned int q_num_bufs = vb2_get_num_buffers(q); - if (q->num_buffers + *nbuffers < 3) - *nbuffers = 3 - q->num_buffers; + if (q_num_bufs + *nbuffers < 3) + *nbuffers = 3 - q_num_bufs; if (*nplanes) return sizes[0] < sur40->pix_fmt.sizeimage ? -EINVAL : 0; -- 2.39.2