Commit 6be95480 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: default avatarLad Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent a13f509b

drivers/media/platform/ti/am437x/am437x-vpfe.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/ti/davinci/vpif.h

+30 −30
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ 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,

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)
@@ -334,7 +334,7 @@ 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,

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)
@@ -345,7 +345,7 @@ 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,

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)
@@ -538,7 +538,7 @@ 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,

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)
@@ -550,7 +550,7 @@ 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,

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)
@@ -561,7 +561,7 @@ 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,

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)

drivers/media/platform/ti/davinci/vpif_capture.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}



/**

drivers/media/platform/ti/davinci/vpif_capture.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/ti/davinci/vpif_display.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

}