From: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
To: linux-media@vger.kernel.org
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hverkuil@xs4all.nl>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Subject: [PATCH v3 1/4] uvcvideo: (cosmetic) add and use an inline function
Date: Mon, 12 Dec 2016 12:16:49 +0100 [thread overview]
Message-ID: <1481541412-1186-2-git-send-email-guennadi.liakhovetski@intel.com> (raw)
In-Reply-To: <1481541412-1186-1-git-send-email-guennadi.liakhovetski@intel.com>
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Add an inline function to obtain a struct uvc_buffer pointer from a
struct vb2_v4l2_buffer one.
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
---
drivers/media/usb/uvc/uvc_queue.c | 6 +++---
drivers/media/usb/uvc/uvcvideo.h | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index 77edd20..c119551 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -89,7 +89,7 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb)
{
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
- struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
+ struct uvc_buffer *buf = uvc_vbuf_to_buffer(vbuf);
if (vb->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) {
@@ -116,7 +116,7 @@ static void uvc_buffer_queue(struct vb2_buffer *vb)
{
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
- struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
+ struct uvc_buffer *buf = uvc_vbuf_to_buffer(vbuf);
unsigned long flags;
spin_lock_irqsave(&queue->irqlock, flags);
@@ -138,7 +138,7 @@ static void uvc_buffer_finish(struct vb2_buffer *vb)
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
struct uvc_streaming *stream = uvc_queue_to_stream(queue);
- struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
+ struct uvc_buffer *buf = uvc_vbuf_to_buffer(vbuf);
if (vb->state == VB2_BUF_STATE_DONE)
uvc_video_clock_update(stream, vbuf, buf);
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 3d6cc62..a1e6a19 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -679,6 +679,10 @@ static inline int uvc_queue_streaming(struct uvc_video_queue *queue)
{
return vb2_is_streaming(&queue->queue);
}
+static inline struct uvc_buffer *uvc_vbuf_to_buffer(struct vb2_v4l2_buffer *vbuf)
+{
+ return container_of(vbuf, struct uvc_buffer, buf);
+}
/* V4L2 interface */
extern const struct v4l2_ioctl_ops uvc_ioctl_ops;
--
1.9.3
next prev parent reply other threads:[~2016-12-12 11:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-12 11:16 [PATCH v3 0/4] uvcvideo: metadata device node Guennadi Liakhovetski
2016-12-12 11:16 ` Guennadi Liakhovetski [this message]
2016-12-30 13:28 ` [PATCH v3 1/4] uvcvideo: (cosmetic) add and use an inline function Laurent Pinchart
2016-12-30 13:50 ` Guennadi Liakhovetski
2016-12-12 11:16 ` [PATCH v3 2/4] uvcvideo: (cosmetic) remove a superfluous assignment Guennadi Liakhovetski
2016-12-30 13:30 ` Laurent Pinchart
2016-12-12 11:16 ` [PATCH v3 3/4] uvcvideo: fix a wrong macro Guennadi Liakhovetski
2016-12-30 13:33 ` Laurent Pinchart
2016-12-12 11:16 ` [PATCH v3 4/4] uvcvideo: add a metadata device node Guennadi Liakhovetski
2016-12-12 17:31 ` kbuild test robot
2016-12-12 18:56 ` kbuild test robot
2016-12-12 19:32 ` kbuild test robot
2016-12-30 10:43 ` Guennadi Liakhovetski
2016-12-30 12:32 ` Laurent Pinchart
2016-12-30 13:04 ` Guennadi Liakhovetski
2016-12-30 13:20 ` Laurent Pinchart
2017-01-03 14:55 ` Guennadi Liakhovetski
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=1481541412-1186-2-git-send-email-guennadi.liakhovetski@intel.com \
--to=guennadi.liakhovetski@intel.com \
--cc=g.liakhovetski@gmx.de \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.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;
as well as URLs for NNTP newsgroup(s).