[PATCH 0/2] staging: media: omap4iss: redefine and use to_iss_buffer

[PATCH 0/2] staging: media: omap4iss: redefine and use to_iss_buffer

[Himadri Pandya]

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(-)

-- 
2.17.1

[PATCH 1/2] staging: media: omap4iss: redefine to_iss_buffer()

[Himadri Pandya]

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.

Signed-off-by: Himadri Pandya <himadri18.07@gmail.com>
---
 drivers/staging/media/omap4iss/iss_video.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/omap4iss/iss_video.h b/drivers/staging/media/omap4iss/iss_video.h
index f22489edb562..3722ac8ba2fa 100644
--- a/drivers/staging/media/omap4iss/iss_video.h
+++ b/drivers/staging/media/omap4iss/iss_video.h
@@ -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 */
-- 
2.17.1

[PATCH 2/2] staging: media: omap4iss: use to_iss_buffer instead of container_of

[Himadri Pandya]

Use inline function to_iss_buffer which converts vb2_buffer into
iss_buffer.

Signed-off-by: Himadri Pandya <himadri18.07@gmail.com>
---
 drivers/staging/media/omap4iss/iss_video.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index c2c5a9cd8642..cdc10f5ffe2c 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -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;
-- 
2.17.1

Re: [PATCH 0/2] staging: media: omap4iss: redefine and use to_iss_buffer

[Greg KH]

On Tue, Apr 02, 2019 at 12:50:13AM +0530, Himadri Pandya wrote:
> 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

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

Re: [PATCH 1/2] staging: media: omap4iss: redefine to_iss_buffer()

[Laurent Pinchart]

Hi Himadri,

Thank you for the patch.

On Tue, Apr 02, 2019 at 12:50:14AM +0530, Himadri Pandya wrote:
> 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.
> 
> Signed-off-by: Himadri Pandya <himadri18.07@gmail.com>
> ---
>  drivers/staging/media/omap4iss/iss_video.h | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/media/omap4iss/iss_video.h b/drivers/staging/media/omap4iss/iss_video.h
> index f22489edb562..3722ac8ba2fa 100644
> --- a/drivers/staging/media/omap4iss/iss_video.h
> +++ b/drivers/staging/media/omap4iss/iss_video.h
> @@ -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)

> +}
>  
>  enum iss_video_dmaqueue_flags {
>  	/* Set if DMA queue becomes empty when ISS_PIPELINE_STREAM_CONTINUOUS */

-- 
Regards,

Laurent Pinchart

Re: [PATCH 0/2] staging: media: omap4iss: redefine and use to_iss_buffer

[Himadri Pandya]

[-- Attachment #1: Type: text/plain, Size: 673 bytes --]

On Tue, 2 Apr, 2019, 11:23 AM Greg KH, <gregkh@linuxfoundation.org> wrote:

> On Tue, Apr 02, 2019 at 12:50:13AM +0530, Himadri Pandya wrote:
> > 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
>
> 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

>

[-- Attachment #2: Type: text/html, Size: 1298 bytes --]

Re: [PATCH 1/2] staging: media: omap4iss: redefine to_iss_buffer()

[Himadri Pandya]

[-- Attachment #1: Type: text/plain, Size: 1812 bytes --]

On Tue, 2 Apr, 2019, 12:28 PM Laurent Pinchart, <
laurent.pinchart@ideasonboard.com> wrote:

> Hi Himadri,
>
> Thank you for the patch.
>
> On Tue, Apr 02, 2019 at 12:50:14AM +0530, Himadri Pandya wrote:
> > 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.
> >
> > Signed-off-by: Himadri Pandya <himadri18.07@gmail.com>
> > ---
> >  drivers/staging/media/omap4iss/iss_video.h | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/media/omap4iss/iss_video.h
> b/drivers/staging/media/omap4iss/iss_video.h
> > index f22489edb562..3722ac8ba2fa 100644
> > --- a/drivers/staging/media/omap4iss/iss_video.h
> > +++ b/drivers/staging/media/omap4iss/iss_video.h
> > @@ -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)
>

Okay. I'll do that. Thank you.

- Himadri


> > +}
> >
> >  enum iss_video_dmaqueue_flags {
> >       /* Set if DMA queue becomes empty when
> ISS_PIPELINE_STREAM_CONTINUOUS */
>
> --
> Regards,
>
> Laurent Pinchart
>

[-- Attachment #2: Type: text/html, Size: 2732 bytes --]