staging: media: omap4iss: redefine and use to_iss_buffer
Subsystems (2)
cover staging: media: omap4iss: redefine and use to_iss_buffer
These patches
- redefines an unused macro to_iss_buffer into an inline function
- uses that inline function in suitable functions
Himadri Pandya (2):
staging: media: omap4iss: redefine to_iss_buffer()
staging: media: omap4iss: use to_iss_buffer instead of container_of
drivers/staging/media/omap4iss/iss_video.c | 9 +++------ drivers/staging/media/omap4iss/iss_video.h | 7 ++++++- 2 files changed, 9 insertions(+), 7 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 staging: media: omap4iss: redefine to_iss_buffer()
Currently macro to_iss_buffer converts vb2_v4l2_buffer into iss_buffer. But the application needs the conversion from vb2_buffer to iss_bufffer. So they need to convert vb2_buffer into vb2_v4l2_buffer first and then vb2_v4l2_buffer into iss_buffer. Redefining to_iss_buffer to convert from vb2_buffer into iss_buffer directly helps the situation.
--- drivers/staging/media/omap4iss/iss_video.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/media/omap4iss/iss_video.h +6 -1
@@ -118,7 +118,12 @@ struct iss_buffer {dma_addr_t iss_addr; }; -#define to_iss_buffer (buf) container_of(buf, struct iss_buffer, vb) +static inline struct iss_buffer *to_iss_buffer (struct vb2_buffer *vb) +{ + struct vb2_v4l2_buffer *vbuf = container_of(vb, struct vb2_v4l2_buffer, vb2_buf); + + return container_of(vbuf, struct iss_buffer, vb); +}enum iss_video_dmaqueue_flags {/* Set if DMA queue becomes empty when ISS_PIPELINE_STREAM_CONTINUOUS */
Signature · 1 line
2.17.1
Re: [PATCH 1/2] staging: media: omap4iss: redefine to_iss_buffer()
Hi Himadri,
Thank you for the patch.
Quoted 16 lines · Himadri Pandya
Currently macro
to_iss_bufferconvertsvb2_v4l2_bufferintoiss_buffer. But the application needs the conversion fromvb2_buffertoiss_bufffer. So they need to convertvb2_bufferintovb2_v4l2_bufferfirst and thenvb2_v4l2_bufferintoiss_buffer. Redefiningto_iss_bufferto convert fromvb2_bufferintoiss_bufferdirectly helps the situation.Signed-off-by Himadri Pandya <[email protected]>--- drivers/staging/media/omap4iss/iss_video.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/staging/media/omap4iss/iss_video.h +0
-0
drivers/staging/media/omap4iss/iss_video.h struct iss_buffer { · line 125
Quoted 9 lines
drivers/staging/media/omap4iss/iss_video.h +5
-1@@ -118,7 +118,12 @@ struct iss_buffer {dma_addr_t iss_addr; }; -#define to_iss_buffer (buf) container_of(buf, struct iss_buffer, vb) +static inline struct iss_buffer *to_iss_buffer (struct vb2_buffer *vb) +{ + struct vb2_v4l2_buffer *vbuf = container_of(vb, struct vb2_v4l2_buffer, vb2_buf); + + return container_of(vbuf, struct iss_buffer, vb);
In addition to Greg's comment about merging the two patches in one, you can also merge the above two lines with
container_of(vb, iss_buffer, vb.vb2_buf)
Quoted 4 lines
drivers/staging/media/omap4iss/iss_video.h +1
-0+}enum iss_video_dmaqueue_flags {/* Set if DMA queue becomes empty when ISS_PIPELINE_STREAM_CONTINUOUS */
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCH 1/2] staging: media: omap4iss: redefine to_iss_buffer()
Quoted 30 lines · Laurent Pinchart,
Hi Himadri,
Thank you for the patch.
Quoted 6 lines · Himadri Pandya
Currently macro
to_iss_bufferconvertsvb2_v4l2_bufferintoiss_buffer. But the application needs the conversion fromvb2_buffertoiss_bufffer. So they need to convertvb2_bufferintovb2_v4l2_bufferfirst and thenvb2_v4l2_bufferintoiss_buffer. Redefiningto_iss_bufferto convert fromvb2_bufferintoiss_bufferdirectly helps the situation.Review
Quoted 6 lines
Signed-off-by Himadri Pandya <[email protected]>--- drivers/staging/media/omap4iss/iss_video.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/staging/media/omap4iss/iss_video.hdrivers/staging/media/omap4iss/iss_video.h struct iss_buffer { · line 123
Quoted 11 lines
index
f22489edb562..3722ac8ba2fa100644drivers/staging/media/omap4iss/iss_video.h +3
-1@@ -118,7 +118,12 @@ struct iss_buffer {dma_addr_t iss_addr; }; -#define to_iss_buffer (buf) container_of(buf, struct iss_buffer, vb) +static inline struct iss_buffer *to_iss_buffer (struct vb2_buffer *vb) +{ + struct vb2_v4l2_buffer *vbuf = container_of(vb, struct
vb2_v4l2_buffer,vb2_buf);
Quoted 8 lines
drivers/staging/media/omap4iss/iss_video.h struct iss_buffer { · line 125
Quoted 2 lines
drivers/staging/media/omap4iss/iss_video.h +2
-0+ + return container_of(vbuf, struct iss_buffer, vb);In addition to Greg's comment about merging the two patches in one, you can also merge the above two lines with
container_of(vb, iss_buffer, vb.vb2_buf)
Okay. I'll do that. Thank you.
- Himadri
Quoted 11 lines
drivers/staging/media/omap4iss/iss_video.h struct iss_buffer {
Quoted 4 lines
drivers/staging/media/omap4iss/iss_video.h +1
-0+}enum iss_video_dmaqueue_flags {/* Set if DMA queue becomes empty when
ISS_PIPELINE_STREAM_CONTINUOUS*/--
Regards,Laurent Pinchart
PATCH 2/2 staging: media: omap4iss: use to_iss_buffer instead of container_of
In reply to Himadri PandyaUse inline function to_iss_buffer which converts vb2_buffer into iss_buffer.
--- drivers/staging/media/omap4iss/iss_video.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/staging/media/omap4iss/iss_video.c +3 -6
@@ -318,8 +318,7 @@ static int iss_video_queue_setup(struct vb2_queue *vq,static void iss_video_buf_cleanup (struct vb2_buffer *vb) { -struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb); - struct iss_buffer *buffer = container_of(vbuf, struct iss_buffer, vb); +struct iss_buffer *buffer =to_iss_buffer (vb);if (buffer->iss_addr) buffer->iss_addr =0 ;
@@ -327,9 +326,8 @@ static void iss_video_buf_cleanup(struct vb2_buffer *vb)static int iss_video_buf_prepare (struct vb2_buffer *vb) { -struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb);struct iss_video_fh *vfh =vb2_get_drv_priv (vb->vb2_queue); - struct iss_buffer *buffer = container_of(vbuf, struct iss_buffer, vb); +struct iss_buffer *buffer =to_iss_buffer (vb);struct iss_video *video = vfh->video;unsigned long size = vfh->format.fmt.pix.sizeimage;dma_addr_t addr;
@@ -351,10 +349,9 @@ static int iss_video_buf_prepare(struct vb2_buffer *vb)static void iss_video_buf_queue (struct vb2_buffer *vb) { -struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb);struct iss_video_fh *vfh =vb2_get_drv_priv (vb->vb2_queue);struct iss_video *video = vfh->video; - struct iss_buffer *buffer = container_of(vbuf, struct iss_buffer, vb); +struct iss_buffer *buffer =to_iss_buffer (vb);struct iss_pipeline *pipe =to_iss_pipeline (&video->video.entity);unsigned long flags;bool empty;
Signature · 1 line
2.17.1
Greg KH
maintainerQuoted 8 lines · Himadri Pandya
These patches
- redefines an unused macroto_iss_bufferinto an inline function
- uses that inline function in suitable functionsHimadri Pandya (2):
staging: media: omap4iss: redefineto_iss_buffer()
staging: media: omap4iss: useto_iss_bufferinstead ofcontainer_of
Can you make this one patch? It makes things a lot more obvious as to why you are doing what you did in patch 1, when you see patch 2, so these should just be together.
thanks,
greg k-h
Quoted 10 lines · Greg KH,
Quoted 8 lines · Himadri Pandya
These patches
- redefines an unused macroto_iss_bufferinto an inline function
- uses that inline function in suitable functionsHimadri Pandya (2):
staging: media: omap4iss: redefineto_iss_buffer()
staging: media: omap4iss: useto_iss_bufferinstead ofcontainer_of
Quoted 8 lines
Can you make this one patch? It makes things a lot more obvious as to why you are doing what you did in patch 1, when you see patch 2, so these should just be together.
thanks,
greg k-h
Okay.
- Himadri