From: Corentin Labbe <clabbe@baylibre.com>
To: mchehab@kernel.org, hverkuil@xs4all.nl, gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-staging@lists.linux.dev, mjpeg-users@lists.sourceforge.net,
Hans Verkuil <hans.verkuil@cisco.com>,
Corentin Labbe <clabbe@baylibre.com>
Subject: [PATCH v4 18/18] staging: media: zoran: drop read/write support
Date: Tue, 14 Dec 2021 16:16:36 +0000 [thread overview]
Message-ID: <20211214161636.1886900-19-clabbe@baylibre.com> (raw)
In-Reply-To: <20211214161636.1886900-1-clabbe@baylibre.com>
From: Hans Verkuil <hans.verkuil@cisco.com>
This makes no sense for MJPEG formats and it is just easier to
drop support for this altogether.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
drivers/staging/media/zoran/zoran_card.c | 2 +-
drivers/staging/media/zoran/zoran_driver.c | 12 ------------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c
index e6d3558323a9..59df1e7691f9 100644
--- a/drivers/staging/media/zoran/zoran_card.c
+++ b/drivers/staging/media/zoran/zoran_card.c
@@ -879,7 +879,7 @@ static int zoran_init_video_device(struct zoran *zr, struct video_device *video_
*video_dev = zoran_template;
video_dev->v4l2_dev = &zr->v4l2_dev;
video_dev->lock = &zr->lock;
- video_dev->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE | dir;
+ video_dev->device_caps = V4L2_CAP_STREAMING | dir;
strscpy(video_dev->name, ZR_DEVNAME(zr), sizeof(video_dev->name));
/*
diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c
index 013efdecd582..4304b7e21709 100644
--- a/drivers/staging/media/zoran/zoran_driver.c
+++ b/drivers/staging/media/zoran/zoran_driver.c
@@ -734,15 +734,6 @@ static int zoran_s_selection(struct file *file, void *__fh, struct v4l2_selectio
return res;
}
-static int zoran_g_parm(struct file *file, void *priv, struct v4l2_streamparm *parm)
-{
- if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
- return -EINVAL;
-
- parm->parm.capture.readbuffers = 9;
- return 0;
-}
-
/*
* Output is disabled temporarily
* Zoran is picky about jpeg data it accepts. At least it seems to unsupport COM and APPn.
@@ -750,7 +741,6 @@ static int zoran_g_parm(struct file *file, void *priv, struct v4l2_streamparm *p
*/
static const struct v4l2_ioctl_ops zoran_ioctl_ops = {
.vidioc_querycap = zoran_querycap,
- .vidioc_g_parm = zoran_g_parm,
.vidioc_s_selection = zoran_s_selection,
.vidioc_g_selection = zoran_g_selection,
.vidioc_enum_input = zoran_enum_input,
@@ -786,8 +776,6 @@ static const struct v4l2_file_operations zoran_fops = {
.unlocked_ioctl = video_ioctl2,
.open = v4l2_fh_open,
.release = vb2_fop_release,
- .read = vb2_fop_read,
- .write = vb2_fop_write,
.mmap = vb2_fop_mmap,
.poll = vb2_fop_poll,
};
--
2.32.0
prev parent reply other threads:[~2021-12-14 16:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-14 16:16 [PATCH v4 00/18] staging: media: zoran: merge in one module Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 01/18] staging: media: zoran: move module parameter checks to zoran_probe Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 02/18] staging: media: zoran: use module_pci_driver Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 03/18] staging: media: zoran: rename debug module parameter Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 04/18] staging: media: zoran: add debugfs Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 05/18] staging: media: zoran: videocode: remove procfs Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 06/18] staging: media: zoran: merge all modules Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 07/18] staging: media: zoran: remove vidmem Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 08/18] staging: media: zoran: move videodev alloc Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 09/18] staging: media: zoran: move config select on primary kconfig Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 10/18] staging: media: zoran: introduce zoran_i2c_init Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 11/18] staging: media: zoran: fix usage of vb2_dma_contig_set_max_seg_size Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 12/18] staging: media: zoran: clean unused code Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 13/18] staging: media: zoran: fix counting buffer in reserve Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 14/18] staging: media: zoran: calculate the right buffer number for zoran_reap_stat_com Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 15/18] staging: media: zoran: fix various V4L2 compliance errors Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 16/18] staging: media: zoran: fix TRY_FMT handling Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 17/18] staging: media: zoran: drop kernel log spam Corentin Labbe
2021-12-14 16:16 ` Corentin Labbe [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211214161636.1886900-19-clabbe@baylibre.com \
--to=clabbe@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=hans.verkuil@cisco.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mjpeg-users@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®