From patchwork Mon Nov 27 16:54:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3285759vqx; Mon, 27 Nov 2023 08:55:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGO3q7L0Z0Pxvd60nrimdMHQ+VbOI62ar1Bue2nZP8E4Kk/e7lUuS2KsvSuZ/JbDtECs/Pe X-Received: by 2002:a17:902:c18b:b0:1cf:b2a9:fc00 with SMTP id d11-20020a170902c18b00b001cfb2a9fc00mr10985142pld.9.1701104129214; Mon, 27 Nov 2023 08:55:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104129; cv=none; d=google.com; s=arc-20160816; b=cEnsbsAiEM1oaOrc5+9gTd+JpjsMD0C6JDyh6ixl6MITj5cSNHK0xTWZwva29BMOGQ QLkjsUoADxbcwEDSUBWbL71Dxdc5UmWYo8T3wY346ovCiOuZ0l3ORacvrveWDicmgKKL dDEVhP8jCkzuxTDC6rG/vZx0CwT9TO4biQnuGF8Rw3XzqVYrD1gCgf7AKPy5Vor/RYNm EkdCKS/KZBvcy1oxL8p1sevShkui9gPKrAHp833yYAnoGcum4fuFK1p3J4itRGq+aR7X SHWlAH/GQQ5zcKd5Tk6ex9doTduuopLMPXyJ+Z9kOyDoGzzmjHiJch1g3+X0u28rQt5D fMqA== 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=hlUou+za8CPzr8eWcT5B2w6W/joBp/pDK/2ILYJZvR0=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=ljGTK0cP06hOsjfZ2lTVYbrfSWShtd5Tek6Bj/Imzd6ism732VzeUlyHqqM77oOmkf zWTeKbnGsvwy1Mx0mA98DAtMRAGI5P6QdkmBFnICsONNWmlpSs0gFz+nrL2uwGnEGXOr QuR95iUmQH3OIjsTJo/aWJap+X5PRbq8zUZ8XtO82/xpRroSIaJDWLPZrpdy29srythc iAnhBV1RSmiJWbQI3OCbZZyKSrPh0niOJZb0Hdz+q9KRUHL42AMxKah8zwPtkBrkjzpm SZDf53yMgceC4N4hcire6mi/GEnLorNEAQmIZo5Xs24bHQDTMhbD8sOSqh2XcAkS+GWI 2xVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=D7tOhGoZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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. [23.128.96.37]) by mx.google.com with ESMTPS id jf3-20020a170903268300b001c4062a0e43si9592998plb.169.2023.11.27.08.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:55:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=D7tOhGoZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 13A6880A2640; Mon, 27 Nov 2023 08:55:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234250AbjK0QzN (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232335AbjK0QzD (ORCPT ); Mon, 27 Nov 2023 11:55:03 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1688819B; Mon, 27 Nov 2023 08:55:10 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 6F1FE6607286; Mon, 27 Nov 2023 16:55:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104109; bh=cSCDQ8wlrHHxZIMdX6yERM4DP0+7F96unl/YfCpM+80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D7tOhGoZPJaPsvWVJ8Atsd6mk6513xTTrg+4o38gsdrIl/awNv66gZx6u/lM7Mor5 oAj/uQLEdUP+btCuLOhWctSfo4Sgf3d3ylSPAPamYDjXGJYmxEiHmEKGI/5s66uG6C /ABdvLoH/nQunEo7/CoO0uArFNtKbtrPp4a0gRCYvXLeecADD5YVEE3VQ91CJ4Mnlo BX4UukdWNVV9zhGeqnuITExTYnjqBTnb7FuhrHLogkE/DTzdcd+P1zvysRrFq4UlrZ 0wxqEn63/UXygAX7ShNebkQyb1AtQRkzF4gajpJVeK5p24u3aeZHOka7GFPWY412DV rUFsMOW1ruqLA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 05/55] media: usb: gspca: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:04 +0100 Message-Id: <20231127165454.166373-6-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-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,T_SCC_BODY_TEXT_LINE 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]); Mon, 27 Nov 2023 08:55:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783736963453452807 X-GMAIL-MSGID: 1783736963453452807 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. gspca driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard --- drivers/media/usb/gspca/gspca.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c index 770714c34295..7b701275f76d 100644 --- a/drivers/media/usb/gspca/gspca.c +++ b/drivers/media/usb/gspca/gspca.c @@ -1257,7 +1257,7 @@ static int vidioc_g_parm(struct file *filp, void *priv, { struct gspca_dev *gspca_dev = video_drvdata(filp); - parm->parm.capture.readbuffers = gspca_dev->queue.min_buffers_needed; + parm->parm.capture.readbuffers = gspca_dev->queue.min_reqbufs_allocation; if (!gspca_dev->sd_desc->get_streamparm) return 0; @@ -1273,7 +1273,7 @@ static int vidioc_s_parm(struct file *filp, void *priv, { struct gspca_dev *gspca_dev = video_drvdata(filp); - parm->parm.capture.readbuffers = gspca_dev->queue.min_buffers_needed; + parm->parm.capture.readbuffers = gspca_dev->queue.min_reqbufs_allocation; if (!gspca_dev->sd_desc->set_streamparm) { parm->parm.capture.capability = 0; @@ -1517,7 +1517,7 @@ int gspca_dev_probe2(struct usb_interface *intf, q->ops = &gspca_qops; q->mem_ops = &vb2_vmalloc_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 2; + q->min_reqbufs_allocation = 2; q->lock = &gspca_dev->usb_lock; ret = vb2_queue_init(q); if (ret)