media: exynos4-is: fix kernel-doc warnings (37157ffb) · Commits · jan.koester / Linux

drivers/media/platform/exynos4-is/fimc-core.h

+8 −2

Original line number	Diff line number	Diff line
		@@ -242,6 +242,7 @@ struct fimc_vid_buffer {
		* @addr: image frame buffer DMA addresses
		* @dma_offset: DMA offset in bytes
		* @fmt: fimc color format pointer
		* @alpha: alpha value
		*/
		struct fimc_frame {
		u32 f_width;
		@@ -296,6 +297,7 @@ struct fimc_m2m_device {
		* @buf_index: index for managing the output DMA buffers
		* @frame_count: the frame counter for statistics
		* @reqbufs_count: the number of buffers requested in REQBUFS ioctl
		* @streaming: is streaming in progress?
		* @input: capture input type, grp_id of the attached subdev
		* @user_subdev_api: true if subdevs are not configured by the host driver
		*/
		@@ -400,6 +402,7 @@ struct fimc_ctx;
		* @pdata: pointer to the device platform data
		* @sysreg: pointer to the SYSREG regmap
		* @variant: the IP variant information
		* @drv_data: driver data
		* @id: FIMC device index (0..FIMC_MAX_DEVS)
		* @clock: clocks required for FIMC operation
		* @regs: the mapped hardware registers
		@@ -408,7 +411,6 @@ struct fimc_ctx;
		* @m2m: memory-to-memory V4L2 device information
		* @vid_cap: camera capture device information
		* @state: flags used to synchronize m2m and capture mode operation
		* @pipeline: fimc video capture pipeline data structure
		*/
		struct fimc_dev {
		spinlock_t slock;
		@@ -458,7 +460,7 @@ struct fimc_ctrls {
		* @d_frame: destination frame properties
		* @out_order_1p: output 1-plane YCBCR order
		* @out_order_2p: output 2-plane YCBCR order
		* @in_order_1p input 1-plane YCBCR order
		* @in_order_1p: input 1-plane YCBCR order
		* @in_order_2p: input 2-plane YCBCR order
		* @in_path: input mode (DMA or camera)
		* @out_path: output mode (DMA or FIFO)
		@@ -666,6 +668,7 @@ int fimc_capture_resume(struct fimc_dev *fimc);

		/**
		* fimc_active_queue_add - add buffer to the capture active buffers queue
		* @vid_cap: camera capture device information
		* @buf: buffer to add to the active buffers list
		*/
		static inline void fimc_active_queue_add(struct fimc_vid_cap *vid_cap,
		@@ -677,6 +680,7 @@ static inline void fimc_active_queue_add(struct fimc_vid_cap *vid_cap,

		/**
		* fimc_active_queue_pop - pop buffer from the capture active buffers queue
		* @vid_cap: camera capture device information
		*
		* The caller must assure the active_buf_q list is not empty.
		*/
		@@ -693,6 +697,7 @@ static inline struct fimc_vid_buffer *fimc_active_queue_pop(

		/**
		* fimc_pending_queue_add - add buffer to the capture pending buffers queue
		* @vid_cap: camera capture device information
		* @buf: buffer to add to the pending buffers list
		*/
		static inline void fimc_pending_queue_add(struct fimc_vid_cap *vid_cap,
		@@ -703,6 +708,7 @@ static inline void fimc_pending_queue_add(struct fimc_vid_cap *vid_cap,

		/**
		* fimc_pending_queue_pop - pop buffer from the capture pending buffers queue
		* @vid_cap: camera capture device information
		*
		* The caller must assure the pending_buf_q list is not empty.
		*/

drivers/media/platform/exynos4-is/fimc-isp.h

+12 −5

Original line number	Diff line number	Diff line
		@@ -110,16 +110,20 @@ struct isp_video_buf {

		/**
		* struct fimc_is_video - fimc-is video device structure
		* @vdev: video_device structure
		* @ve: video_device structure and media pipeline
		* @type: video device type (CAPTURE/OUTPUT)
		* @pad: video device media (sink) pad
		* @pending_buf_q: pending buffers queue head
		* @active_buf_q: a queue head of buffers scheduled in hardware
		* @vb_queue: vb2 buffer queue
		* @active_buf_count: number of video buffers scheduled in hardware
		* @reqbufs_count: the number of buffers requested in REQBUFS ioctl
		* @buf_count: number of video buffers scheduled in hardware
		* @buf_mask: bitmask of the queued video buffer indices
		* @frame_count: counter of frames dequeued to user space
		* @reqbufs_count: number of buffers requested with REQBUFS ioctl
		* @format: current pixel format
		* @streaming: is streaming in progress?
		* @buffers: buffer info
		* @format: current fimc pixel format
		* @pixfmt: current pixel format
		*/
		struct fimc_is_video {
		struct exynos_video_entity ve;
		@@ -147,9 +151,12 @@ struct fimc_is_video {
		* @pdev: pointer to FIMC-IS platform device
		* @subdev: ISP v4l2_subdev
		* @subdev_pads: the ISP subdev media pads
		* @src_fmt: source mediabus format
		* @sink_fmt: sink mediabus format
		* @test_pattern: test pattern controls
		* @ctrls: v4l2 controls structure
		* @video_lock: mutex serializing video device and the subdev operations
		* @video_lock: mutex serializing video device operations
		* @subdev_lock: mutex serializing subdev operations
		* @cac_margin_x: horizontal CAC margin in pixels
		* @cac_margin_y: vertical CAC margin in pixels
		* @state: driver state flags

drivers/media/platform/exynos4-is/fimc-lite.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,8 @@ struct flite_buffer {
		* @active_buf_count: number of video buffers scheduled in hardware
		* @frame_count: the captured frames counter
		* @reqbufs_count: the number of buffers requested with REQBUFS ioctl
		* @events: event info
		* @streaming: is streaming in progress?
		*/
		struct fimc_lite {
		struct platform_device *pdev;

drivers/media/platform/exynos4-is/fimc-reg.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,7 @@ void fimc_deactivate_capture(struct fimc_dev *fimc);

		/**
		* fimc_hw_set_dma_seq - configure output DMA buffer sequence
		* @dev: fimc device
		* @mask: bitmask for the DMA output buffer registers, set to 0 to skip buffer
		* This function masks output DMA ring buffers, it allows to select which of
		* the 32 available output buffer address registers will be used by the DMA

drivers/media/platform/exynos4-is/media-dev.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -100,6 +100,8 @@ struct cam_clk {
		* @sensor: array of registered sensor subdevs
		* @num_sensors: actual number of registered sensors
		* @camclk: external sensor clock information
		* @wbclk: external writeback clock information
		* @fimc_lite: array of registered fimc-lite devices
		* @fimc: array of registered fimc devices
		* @fimc_is: fimc-is data structure
		* @use_isp: set to true when FIMC-IS subsystem is used
		@@ -107,9 +109,12 @@ struct cam_clk {
		* @media_dev: top level media device
		* @v4l2_dev: top level v4l2_device holding up the subdevs
		* @pdev: platform device this media device is hooked up into
		* @cam_clk_provider: CAMCLK clock provider structure
		* @clk_provider: CAMCLK clock provider structure
		* @subdev_notifier: notifier for the subdevs
		* @user_subdev_api: true if subdevs are not configured by the host driver
		* @slock: spinlock protecting @sensor array
		* @pipelines: list of pipelines
		* @link_setup_graph: graph iterator
		*/
		struct fimc_md {
		struct fimc_csis_info csis[CSIS_MAX_ENTITIES];