From: Gustavo Padovan <gustavo@padovan.org>
To: linux-media@vger.kernel.org
Cc: Gustavo Padovan <gustavo.padovan@collabora.com>,
Andy Walls <awalls@md.metrocast.net>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 2/6] [media] ivtv: improve subscribe_event handling
Date: Wed, 15 Feb 2017 15:55:29 -0200 [thread overview]
Message-ID: <20170215175533.6384-2-gustavo@padovan.org> (raw)
In-Reply-To: <20170215175533.6384-1-gustavo@padovan.org>
From: Gustavo Padovan <gustavo.padovan@collabora.com>
Simplify logic and call v4l2_ctrl_subscribe_event() directly instead
of copying its content over to ivtv_subscribe_event().
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
---
drivers/media/pci/ivtv/ivtv-ioctl.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index f956188..670462d 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -1506,10 +1506,8 @@ static int ivtv_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subs
case V4L2_EVENT_VSYNC:
case V4L2_EVENT_EOS:
return v4l2_event_subscribe(fh, sub, 0, NULL);
- case V4L2_EVENT_CTRL:
- return v4l2_event_subscribe(fh, sub, 0, &v4l2_ctrl_sub_ev_ops);
default:
- return -EINVAL;
+ return v4l2_ctrl_subscribe_event(fh, sub);
}
}
--
2.9.3
next prev parent reply other threads:[~2017-02-15 17:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 17:55 [PATCH 1/6] [media] vb2: only check ret if we assigned it Gustavo Padovan
2017-02-15 17:55 ` Gustavo Padovan [this message]
2017-02-15 17:55 ` [PATCH 3/6] [media] solo6x10: improve subscribe event handling Gustavo Padovan
2017-02-23 11:28 ` Andrey Utkin
2017-02-15 17:55 ` [PATCH 4/6] [media] tw5864: " Gustavo Padovan
2017-02-23 11:28 ` Andrey Utkin
2017-02-15 17:55 ` [PATCH 5/6] [media] vivid: " Gustavo Padovan
2017-02-15 17:55 ` [PATCH 6/6] [media] go7007: " Gustavo Padovan
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=20170215175533.6384-2-gustavo@padovan.org \
--to=gustavo@padovan.org \
--cc=awalls@md.metrocast.net \
--cc=gustavo.padovan@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/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