Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp248436rdg; Thu, 12 Oct 2023 04:49:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEW120CgWBwFyjjX5FCd7kfPvCgtEFU34lKwxGkqpptpKS/8+m/ODp8mfBOuqd0+Z9Ddt8P X-Received: by 2002:a05:6a00:13a3:b0:693:4552:cd6a with SMTP id t35-20020a056a0013a300b006934552cd6amr25389224pfg.16.1697111377186; Thu, 12 Oct 2023 04:49:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697111377; cv=none; d=google.com; s=arc-20160816; b=NdBR+gAzhmXwugsOa/NDlFFDTwtZIYRReogJVDkd+qkD/fkIcahnqo/9S6LibNKZ2N u0H28vctC3uJNxYcOkTDuJ5sApDHnB7qIC3sB4kF9cqLcCZzvc8O7h/BW0k+qpaRljs8 EEcnIZj/hedRJv2U/zjnjmVDItWLfZLNKDu1o5xITefGmkj/mujlru3jWJPl4zTTETck ZTHRAHlG/vN4TI/2Y+ggr0egTo86gJtHcdV9E+UjdXTV0M8Z96HtseGqbwpM+DKx8TjZ 0P01ARBsgR6VDmmOPKIwAWjmmWPzJvr5SkTTzJJY23wYrRSkwIo0rEN3uzaKVilZdkJ3 8fWA== 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=ei78TxWOcTSjoFVP8g+Q8911l0kULI5hASOKgXFSt0A=; fh=QEr6LkXZ0b5ECaCCGx2MOhsbOAaVsr2qEDjA2CECWis=; b=B9XxkxBabvAR5Z2yjkOkmkDocI8RWPa771TYqT66ea//35VhYiuSB9jWYjbD6bRl5e k4HeOfJtpwP3reWis1rHvzepvGleljBoxJxXTboz9SoRR54ZPL60c7wbEi1ahVKAarz8 9fgau3QnOSTVbYmwbA9Rtc1oD6+qRv6Z4B9FAea4zpAoZxg4tS8tS+YOS3x2EElJuDNE hsELdAocD0HjPzqp/b5meTQSNLptADKkrUofat4qFkp0j8IHyV3KxFiG4Se79fZY5sG1 xTUV+rlkp8nlpzRQuiaHdJBQD8RaNFJL2cp+SbOQQG/FY1mrSrLJNNSIl5Z1occ+I3ee KHiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=JDqtYrts; 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 Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id fa28-20020a056a002d1c00b0068e48477befsi8234938pfb.211.2023.10.12.04.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 04:49:37 -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=JDqtYrts; 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 2067E822CEE1; Thu, 12 Oct 2023 04:49:36 -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 S1378422AbjJLLta (ORCPT + 99 others); Thu, 12 Oct 2023 07:49:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378431AbjJLLrd (ORCPT ); Thu, 12 Oct 2023 07:47:33 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B35CD8; Thu, 12 Oct 2023 04:47:12 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:7ae7:b86d:c19a:877e]) (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 25CF06607374; Thu, 12 Oct 2023 12:47:10 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697111230; bh=2ob6WtKtRZ9d5xOWNbdQXjkC4MZ/+NminFNhqg2q8Mo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JDqtYrtskHtqMoqYnBQk0pM4DnGyCO0oy5ec6FPZ7sNGN7fnhoDcH1rfICDYl0CQR dKdZjf2SIjjt+pKu4gCeXXs+F/ZWtj/dPxGa+AHtoAipbAYBJliSL3+3H+undGUYzm BtXwqOlkniaaehIuKp0NBIj4hcDDqS4Zmz6Wxd/azcGzmNKTcf3ET2qiKi3I87XOmr mPw5ipD+zjXqg3cWrJlxnkR64AZ4UUyoZq15BmMfeSRITjb6cY58PDCFI80FgYQLVH 0a7qcPxP18972eMvvqIoc2nLNBxwHRgjB9RB/OAArsO86IcXoQNE0xymqA3QZ8Cl0B HsF40gcYL9xjQ== 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 v11 39/56] touchscreen: sur40: Stop direct calls to queue num_buffers field Date: Thu, 12 Oct 2023 13:46:25 +0200 Message-Id: <20231012114642.19040-40-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231012114642.19040-1-benjamin.gaignard@collabora.com> References: <20231012114642.19040-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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]); Thu, 12 Oct 2023 04:49:36 -0700 (PDT) Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. 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; -- 2.39.2