From patchwork Tue Oct 17 14:47:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 154321 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4187344vqb; Tue, 17 Oct 2023 07:49:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbAl3KaUO3zMVe3Y/vkcM6IZvvfGgi79+wH0H3Z/t1oXpzM/qOP1aV+LhnPPsr9tQvzRSM X-Received: by 2002:a05:6a20:7d91:b0:163:57ba:2ad4 with SMTP id v17-20020a056a207d9100b0016357ba2ad4mr2697900pzj.2.1697554190129; Tue, 17 Oct 2023 07:49:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697554190; cv=none; d=google.com; s=arc-20160816; b=EH11BrP5W3EgY03BlUHIIItMRC0nCkWSxRFqNIR51yJKG3lKGujzGks2FlEB0niDbT ZU5cxOpUHPd+yI3/RhVLVoTruRRoa6w+hVn3UyDa3JV6AhYk0qov6tLsDRbAVOtXg6CN lCHLPl6SdNWo+yQJ7L7HZBtmUKHwlQ7nR0YMiwQHBKBk4BYRVoUPILP0xvd269vilEg4 CkkLnb8ssUUCuSQrGjodQcdG0zLP7csKbOB2kiK6LN1YfF36eNvtv36zYVpwlZC3I0JM GXszo1wdYd9IlXsDNcqo4vUU9YQ3J6nO/uBjgCcs6cnHmbIGP4y2NOmCUIZNUlOJfoP6 Ff/w== 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=zFjO6uow6Obeup9D77EypxGyIrYlMpXGEHAdJ1lR1IA=; fh=QEr6LkXZ0b5ECaCCGx2MOhsbOAaVsr2qEDjA2CECWis=; b=gke8+n10//nvOoeTepwfBZPnV+0f5k0xejZ/WvSRGOMvZnaEpuhx6hlSyBriulg3XL fVzyq87Ruxk38oevpeWsA6MHLSwERYdaKU2ViKTj/m11sk4RoeHpHgM7OtGqSAH5x6S2 U2IlXtOxizUF94R2BPuW7zWyoB4hxsvyJHp90XMoBfeItYdxv4eYjLJ5jvdjwP17SaDk YR8Lrl5QqblnOXRzfKBdkKEp29deuOd2KKK4C+zX/LH1zklX6txgvm0bjU9LogtWnZgI jmZnuGtKQQL5CQ7bizhbz/8OggeqJnYEc5lyA6dvJ/EL0bUdeynGSHsOyLhmsrJt/TUP yE6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="JodZ1W+/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bw9-20020a056a02048900b00553800fe4dcsi2171113pgb.583.2023.10.17.07.49.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:49:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="JodZ1W+/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 79A9780E65AB; Tue, 17 Oct 2023 07:49:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344534AbjJQOtg (ORCPT + 20 others); Tue, 17 Oct 2023 10:49:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344273AbjJQOs3 (ORCPT ); Tue, 17 Oct 2023 10:48:29 -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 A6D66F5; Tue, 17 Oct 2023 07:48:22 -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 A7CFA6607390; Tue, 17 Oct 2023 15:48:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554101; bh=YIO5Utop1dEZJgaFYl9UZxqPRCBrM01G+R+w/VTVKWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JodZ1W+/1MbqIt8px5SfY/zz/ceq0+/YYscrHj0APiDCMrIIpxHNFklpHOTW0458G ZcC6T6CQVZy1oAnY6RZggWDiv+GlOQ0v3/X9cVNW3n6YS4FU5KQJamq1Fd0Oa0AOBL j9ryhOM/2jfwsZJIlpjQtFeP2dLk5/AcH9ocYtuSBTINvgaHZSmJicwY/dnzDzwPrH +AMDJTfzr4jFDwscMLRdS5oYcSWdHPqFz0oZCP95IHsRHn6G07+tuELOip+AqnuKct lnAwQRNQoWl1INUFxQJxpF8CLiQy7bveQEZpqWzLFJYd4FRriAJlmVYctcWIXlRRzG RBcIHzBUChBvg== 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 , Henrik Rydberg Subject: [PATCH v12 33/56] touchscreen: sur40: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:33 +0200 Message-Id: <20231017144756.34719-34-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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Tue, 17 Oct 2023 07:49:49 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780014582517538261 X-GMAIL-MSGID: 1780014582517538261 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: Dmitry Torokhov CC: Henrik Rydberg --- 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;