media: platform: ti: avoid using 'videobuf' or 'video-buf'

These terms typically refer to the old version 1 videobuf framework.
It is confusing to use them for the vb2 framework, so reword these
comments.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Lad Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/ti/am437x/am437x-vpfe.h b/drivers/media/platform/ti/am437x/am437x-vpfe.h
index 05ee37d..f8b4e91 100644 (file)
--- a/drivers/media/platform/ti/am437x/am437x-vpfe.h
+++ b/drivers/media/platform/ti/am437x/am437x-vpfe.h
@@ -267,7 +267,7 @@ struct vpfe_device {
         * is different from the image window
         */
        struct v4l2_rect crop;
-       /* Buffer queue used in video-buf */
+       /* Buffer queue used in vb2 */
        struct vb2_queue buffer_queue;
        /* Queue of filled frames */
        struct list_head dma_queue;

diff --git a/drivers/media/platform/ti/davinci/vpif.h b/drivers/media/platform/ti/davinci/vpif.h
index 651943e..52ecc25 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif.h
+++ b/drivers/media/platform/ti/davinci/vpif.h
@@ -322,10 +322,10 @@ static inline void channel1_intr_enable(int enable)
 }
 
 /* inline function to set buffer addresses in case of Y/C non mux mode */
-static inline void ch0_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma,
-                                                unsigned long btm_strt_luma,
-                                                unsigned long top_strt_chroma,
-                                                unsigned long btm_strt_chroma)
+static inline void ch0_set_video_buf_addr_yc_nmux(unsigned long top_strt_luma,
+                                                 unsigned long btm_strt_luma,
+                                                 unsigned long top_strt_chroma,
+                                                 unsigned long btm_strt_chroma)
 {
        regw(top_strt_luma, VPIF_CH0_TOP_STRT_ADD_LUMA);
        regw(btm_strt_luma, VPIF_CH0_BTM_STRT_ADD_LUMA);
@@ -334,10 +334,10 @@ static inline void ch0_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma,
 }
 
 /* inline function to set buffer addresses in VPIF registers for video data */
-static inline void ch0_set_videobuf_addr(unsigned long top_strt_luma,
-                                        unsigned long btm_strt_luma,
-                                        unsigned long top_strt_chroma,
-                                        unsigned long btm_strt_chroma)
+static inline void ch0_set_video_buf_addr(unsigned long top_strt_luma,
+                                         unsigned long btm_strt_luma,
+                                         unsigned long top_strt_chroma,
+                                         unsigned long btm_strt_chroma)
 {
        regw(top_strt_luma, VPIF_CH0_TOP_STRT_ADD_LUMA);
        regw(btm_strt_luma, VPIF_CH0_BTM_STRT_ADD_LUMA);
@@ -345,10 +345,10 @@ static inline void ch0_set_videobuf_addr(unsigned long top_strt_luma,
        regw(btm_strt_chroma, VPIF_CH0_BTM_STRT_ADD_CHROMA);
 }
 
-static inline void ch1_set_videobuf_addr(unsigned long top_strt_luma,
-                                        unsigned long btm_strt_luma,
-                                        unsigned long top_strt_chroma,
-                                        unsigned long btm_strt_chroma)
+static inline void ch1_set_video_buf_addr(unsigned long top_strt_luma,
+                                         unsigned long btm_strt_luma,
+                                         unsigned long top_strt_chroma,
+                                         unsigned long btm_strt_chroma)
 {
 
        regw(top_strt_luma, VPIF_CH1_TOP_STRT_ADD_LUMA);
@@ -538,10 +538,10 @@ static inline void channel3_clipping_enable(int enable)
 }
 
 /* inline function to set buffer addresses in case of Y/C non mux mode */
-static inline void ch2_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma,
-                                                unsigned long btm_strt_luma,
-                                                unsigned long top_strt_chroma,
-                                                unsigned long btm_strt_chroma)
+static inline void ch2_set_video_buf_addr_yc_nmux(unsigned long top_strt_luma,
+                                                 unsigned long btm_strt_luma,
+                                                 unsigned long top_strt_chroma,
+                                                 unsigned long btm_strt_chroma)
 {
        regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_LUMA);
        regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_LUMA);
@@ -550,10 +550,10 @@ static inline void ch2_set_videobuf_addr_yc_nmux(unsigned long top_strt_luma,
 }
 
 /* inline function to set buffer addresses in VPIF registers for video data */
-static inline void ch2_set_videobuf_addr(unsigned long top_strt_luma,
-                                        unsigned long btm_strt_luma,
-                                        unsigned long top_strt_chroma,
-                                        unsigned long btm_strt_chroma)
+static inline void ch2_set_video_buf_addr(unsigned long top_strt_luma,
+                                         unsigned long btm_strt_luma,
+                                         unsigned long top_strt_chroma,
+                                         unsigned long btm_strt_chroma)
 {
        regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_LUMA);
        regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_LUMA);
@@ -561,10 +561,10 @@ static inline void ch2_set_videobuf_addr(unsigned long top_strt_luma,
        regw(btm_strt_chroma, VPIF_CH2_BTM_STRT_ADD_CHROMA);
 }
 
-static inline void ch3_set_videobuf_addr(unsigned long top_strt_luma,
-                                        unsigned long btm_strt_luma,
-                                        unsigned long top_strt_chroma,
-                                        unsigned long btm_strt_chroma)
+static inline void ch3_set_video_buf_addr(unsigned long top_strt_luma,
+                                         unsigned long btm_strt_luma,
+                                         unsigned long top_strt_chroma,
+                                         unsigned long btm_strt_chroma)
 {
        regw(top_strt_luma, VPIF_CH3_TOP_STRT_ADD_LUMA);
        regw(btm_strt_luma, VPIF_CH3_BTM_STRT_ADD_LUMA);
@@ -574,18 +574,18 @@ static inline void ch3_set_videobuf_addr(unsigned long top_strt_luma,
 
 /* inline function to set buffer addresses in VPIF registers for vbi data */
 static inline void ch2_set_vbi_addr(unsigned long top_strt_luma,
-                                        unsigned long btm_strt_luma,
-                                        unsigned long top_strt_chroma,
-                                        unsigned long btm_strt_chroma)
+                                   unsigned long btm_strt_luma,
+                                   unsigned long top_strt_chroma,
+                                   unsigned long btm_strt_chroma)
 {
        regw(top_strt_luma, VPIF_CH2_TOP_STRT_ADD_VANC);
        regw(btm_strt_luma, VPIF_CH2_BTM_STRT_ADD_VANC);
 }
 
 static inline void ch3_set_vbi_addr(unsigned long top_strt_luma,
-                                        unsigned long btm_strt_luma,
-                                        unsigned long top_strt_chroma,
-                                        unsigned long btm_strt_chroma)
+                                   unsigned long btm_strt_luma,
+                                   unsigned long top_strt_chroma,
+                                   unsigned long btm_strt_chroma)
 {
        regw(top_strt_luma, VPIF_CH3_TOP_STRT_ADD_VANC);
        regw(btm_strt_luma, VPIF_CH3_BTM_STRT_ADD_VANC);

diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c
index b91eec8..5807233 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif_capture.c
+++ b/drivers/media/platform/ti/davinci/vpif_capture.c
@@ -632,11 +632,11 @@ static void vpif_config_addr(struct channel_obj *ch, int muxmode)
        common = &(ch->common[VPIF_VIDEO_INDEX]);
 
        if (VPIF_CHANNEL1_VIDEO == ch->channel_id)
-               common->set_addr = ch1_set_videobuf_addr;
+               common->set_addr = ch1_set_video_buf_addr;
        else if (2 == muxmode)
-               common->set_addr = ch0_set_videobuf_addr_yc_nmux;
+               common->set_addr = ch0_set_video_buf_addr_yc_nmux;
        else
-               common->set_addr = ch0_set_videobuf_addr;
+               common->set_addr = ch0_set_video_buf_addr;
 }
 
 /**

diff --git a/drivers/media/platform/ti/davinci/vpif_capture.h b/drivers/media/platform/ti/davinci/vpif_capture.h
index d5951f6..6191056 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif_capture.h
+++ b/drivers/media/platform/ti/davinci/vpif_capture.h
@@ -50,7 +50,7 @@ struct common_obj {
        struct vpif_cap_buffer *next_frm;
        /* Used to store pixel format */
        struct v4l2_format fmt;
-       /* Buffer queue used in video-buf */
+       /* Buffer queue used in vb2 */
        struct vb2_queue buffer_queue;
        /* Queue of filled frames */
        struct list_head dma_queue;

diff --git a/drivers/media/platform/ti/davinci/vpif_display.c b/drivers/media/platform/ti/davinci/vpif_display.c
index 5d524ac..b2df816 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif_display.c
+++ b/drivers/media/platform/ti/davinci/vpif_display.c
@@ -563,12 +563,12 @@ static void vpif_config_addr(struct channel_obj *ch, int muxmode)
        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
 
        if (VPIF_CHANNEL3_VIDEO == ch->channel_id) {
-               common->set_addr = ch3_set_videobuf_addr;
+               common->set_addr = ch3_set_video_buf_addr;
        } else {
                if (2 == muxmode)
-                       common->set_addr = ch2_set_videobuf_addr_yc_nmux;
+                       common->set_addr = ch2_set_video_buf_addr_yc_nmux;
                else
-                       common->set_addr = ch2_set_videobuf_addr;
+                       common->set_addr = ch2_set_video_buf_addr;
        }
 }
 

diff --git a/drivers/media/platform/ti/davinci/vpif_display.h b/drivers/media/platform/ti/davinci/vpif_display.h
index f27474e..dae2005 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif_display.h
+++ b/drivers/media/platform/ti/davinci/vpif_display.h
@@ -64,11 +64,11 @@ struct common_obj {
        struct vpif_disp_buffer *next_frm;      /* Pointer pointing to next
                                                 * vb2_buffer */
        struct v4l2_format fmt;                 /* Used to store the format */
-       struct vb2_queue buffer_queue;          /* Buffer queue used in
-                                                * video-buf */
+       struct vb2_queue buffer_queue;          /* Buffer queue used in vb2 */
 
        struct list_head dma_queue;             /* Queue of filled frames */
-       spinlock_t irqlock;                     /* Used in video-buf */
+       spinlock_t irqlock;                     /* Used for video buffer
+                                                * handling */
 
        /* channel specific parameters */
        struct mutex lock;                      /* lock used to access this

diff --git a/drivers/media/platform/ti/omap3isp/ispvideo.c b/drivers/media/platform/ti/omap3isp/ispvideo.c
index d705918..cc9a97d 100644 (file)
--- a/drivers/media/platform/ti/omap3isp/ispvideo.c
+++ b/drivers/media/platform/ti/omap3isp/ispvideo.c
@@ -1071,7 +1071,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
  * processing might be possible but requires more testing.
  *
  * Stream start must be delayed until buffers are available at both the input
- * and output. The pipeline must be started in the videobuf queue callback with
+ * and output. The pipeline must be started in the vb2 queue callback with
  * the buffers queue spinlock held. The modules subdev set stream operation must
  * not sleep.
  */

diff --git a/include/media/davinci/vpbe_display.h b/include/media/davinci/vpbe_display.h
index 6d2a937..d8751ea 100644 (file)
--- a/include/media/davinci/vpbe_display.h
+++ b/include/media/davinci/vpbe_display.h
@@ -69,13 +69,13 @@ struct vpbe_layer {
        struct vpbe_disp_buffer *cur_frm;
        /* Pointer pointing to next v4l2_buffer */
        struct vpbe_disp_buffer *next_frm;
-       /* videobuf specific parameters
-        * Buffer queue used in video-buf
+       /* vb2 specific parameters
+        * Buffer queue used in vb2
         */
        struct vb2_queue buffer_queue;
        /* Queue of filled frames */
        struct list_head dma_queue;
-       /* Used in video-buf */
+       /* Used for video buffer handling */
        spinlock_t irqlock;
        /* V4l2 specific parameters */
        /* Identifies video device for this layer */