Skip to contentSkip to conversation

media: kerneldoc warnings

PATCH In review Ricardo Ribalda 8 participants 56 messages Jan 26, 2024 – Feb 5, 2024

Subsystems (22)
lore
Share & tools
lore
#0 lore raw

cover media: kerneldoc warnings

While automating the CI, I found the following kernel-doc errors.

---
Ricardo Ribalda (17):
media: mediatek: vcodec: Fix kerneldoc warnings
media: videodev2.h: Fix kerneldoc
media: media-entity.h: Fix kerneldoc
media: cec.h: Fix kerneldoc
media: pci: dt315.h: Fix kerneldoc
media: i2c: css-quirk.h: Fix kerneldoc
media: i2c: adv748: Fix kerneldoc
media: mediatek: jpeg: Fix kerneldoc
media: mediatek: vcodec: Fix kerneldoc
media: verisilicon: Fix kerneldoc
media: qcom: venus: Fix kerneldoc
media: samsung: exynos4-is: Fix kerneldoc
media: samsung: s5p-mfc: Fix kerneldoc
media: dvb-usb: Fix kerneldoc
media: ipu3: Fix kerneldoc
media: staging: meson: Fix kerneldoc
linux: v4l2-vp9.h: Fix kerneldoc

 drivers/media/i2c/adv748x/adv748x.h                |  1 -
 drivers/media/i2c/ccs/ccs-quirk.h                  |  8 +++---
 drivers/media/pci/dt3155/dt3155.h                  |  1 -
 .../media/platform/mediatek/jpeg/mtk_jpeg_core.h   |  1 -
 .../mediatek/vcodec/decoder/mtk_vcodec_dec.h       |  1 -
 .../mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c |  1 -
 .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c      |  1 -
 .../platform/mediatek/vcodec/decoder/vdec_vpu_if.h |  1 -
 .../mediatek/vcodec/encoder/mtk_vcodec_enc.h       |  1 -
 drivers/media/platform/qcom/venus/core.h           |  1 -
 .../media/platform/samsung/exynos4-is/fimc-lite.h  |  3 --
 .../platform/samsung/s5p-mfc/s5p_mfc_common.h      |  1 -
 drivers/media/platform/verisilicon/hantro.h        |  1 -
 drivers/media/usb/dvb-usb/dvb-usb.h                |  2 --
 .../staging/media/ipu3/include/uapi/intel-ipu3.h   |  3 --
 drivers/staging/media/meson/vdec/vdec.h            |  1 -
 include/media/cec.h                                |  2 --
 include/media/media-entity.h                       |  4 ---
 include/media/v4l2-vp9.h                           |  6 +++-
 include/uapi/linux/videodev2.h                     | 32 +++++++++++-----------
 20 files changed, 25 insertions(+), 47 deletions(-)

---
base-commit: 615d300648869c774bd1fe54b4627bb0c20faed4
change-id: 20240126-gix-mtk-warnings-7c70f653717b

Best regards,

Signature · 1 line
Ricardo Ribalda <[email protected]>
#1 lore raw

PATCH 1/17 media: mediatek: vcodec: Fix kerneldoc warnings

These fields seems to be gone:
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c:57: warning: Excess struct member 'wait_key_frame' description in 'vdec_vp8_slice_info' drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c:166: warning: Excess struct member 'mv_joint' description in 'vdec_vp9_slice_counts_map'

---
 drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c    | 1 -
 .../media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c    | 1 -
 2 files changed, 2 deletions(-)
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c +0 -1
index f64b21c07169..f677e499fefa 100644
@@ -37,7 +37,6 @@
  * @bs_sz:		bitstream size
  * @resolution_changed:resolution change flag 1 - changed,  0 - not change
  * @frame_header_type:	current frame header type
- * @wait_key_frame:	wait key frame coming
  * @crc:		used to check whether hardware's status is right
  * @reserved:		reserved, currently unused
  */
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c +0 -1
index 69d37b93bd35..cf48d09b78d7 100644
@@ -141,7 +141,6 @@ struct vdec_vp9_slice_frame_counts {
  * @skip:	skip counts.
  * @y_mode:	Y prediction mode counts.
  * @filter:	interpolation filter counts.
- * @mv_joint:	motion vector joint counts.
  * @sign:	motion vector sign counts.
  * @classes:	motion vector class counts.
  * @class0:	motion vector class0 bit counts.
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 1/17
#2 lore raw

Re: [PATCH 01/17] media: mediatek: vcodec: Fix kerneldoc warnings

Quoted 5 lines · Ricardo Ribalda

These fields seems to be gone:
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c:57: warning: Excess struct member 'wait_key_frame' description in 'vdec_vp8_slice_info' drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c:166: warning: Excess struct member 'mv_joint' description in 'vdec_vp9_slice_counts_map'

Thanks.

Quoted 30 lines
---
 drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c    | 1 -
 .../media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c    | 1 -
 2 files changed, 2 deletions(-)
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c +0 -1
index f64b21c07169..f677e499fefa 100644
@@ -37,7 +37,6 @@
  * @bs_sz:		bitstream size
  * @resolution_changed:resolution change flag 1 - changed,  0 - not change
  * @frame_header_type:	current frame header type
- * @wait_key_frame:	wait key frame coming
  * @crc:		used to check whether hardware's status is right
  * @reserved:		reserved, currently unused
  */
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c +0 -1
index 69d37b93bd35..cf48d09b78d7 100644
@@ -141,7 +141,6 @@ struct vdec_vp9_slice_frame_counts {
  * @skip:	skip counts.
  * @y_mode:	Y prediction mode counts.
  * @filter:	interpolation filter counts.
- * @mv_joint:	motion vector joint counts.
  * @sign:	motion vector sign counts.
  * @classes:	motion vector class counts.
  * @class0:	motion vector class0 bit counts.
Signature · 1 line
#Randy
maintainer Reviewed-by on v1 1/17
#3 lore raw

Re: [PATCH 01/17] media: mediatek: vcodec: Fix kerneldoc warnings

In reply to Ricardo Ribalda

Il 27/01/24 00:16, Ricardo Ribalda ha scritto:

Quoted 5 lines

These fields seems to be gone:
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c:57: warning: Excess struct member 'wait_key_frame' description in 'vdec_vp8_slice_info' drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c:166: warning: Excess struct member 'mv_joint' description in 'vdec_vp9_slice_counts_map'

#4 lore raw

PATCH 2/17 media: videodev2.h: Fix kerneldoc

In reply to Ricardo Ribalda

Named nested unions need their prefix:
https://www.kernel.org/doc/html/latest/doc-guide/kernel-doc.html#nested-structs-unions

---
 include/uapi/linux/videodev2.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
include/uapi/linux/videodev2.h +16 -16
index 68e7ac178cc2..a8015e5e7fa4 100644
@@ -1041,13 +1041,13 @@ struct v4l2_requestbuffers {
  * struct v4l2_plane - plane info for multi-planar buffers
  * @bytesused:		number of bytes occupied by data in the plane (payload)
  * @length:		size of this plane (NOT the payload) in bytes
- * @mem_offset:		when memory in the associated struct v4l2_buffer is
+ * @m.mem_offset:	when memory in the associated struct v4l2_buffer is
  *			V4L2_MEMORY_MMAP, equals the offset from the start of
  *			the device memory for this plane (or is a "cookie" that
  *			should be passed to mmap() called on the video node)
- * @userptr:		when memory is V4L2_MEMORY_USERPTR, a userspace pointer
+ * @m.userptr:		when memory is V4L2_MEMORY_USERPTR, a userspace pointer
  *			pointing to this plane
- * @fd:			when memory is V4L2_MEMORY_DMABUF, a userspace file
+ * @m.fd:		when memory is V4L2_MEMORY_DMABUF, a userspace file
  *			descriptor associated with this plane
  * @m:			union of @mem_offset, @userptr and @fd
  * @data_offset:	offset in the plane to the start of data; usually 0,
@@ -1085,14 +1085,14 @@ struct v4l2_plane {
  * @sequence:	sequence count of this frame
  * @memory:	enum v4l2_memory; the method, in which the actual video data is
  *		passed
- * @offset:	for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
+ * @m.offset:	for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
  *		offset from the start of the device memory for this plane,
  *		(or a "cookie" that should be passed to mmap() as offset)
- * @userptr:	for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
+ * @m.userptr:	for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
  *		a userspace pointer pointing to this buffer
- * @fd:		for non-multiplanar buffers with memory == V4L2_MEMORY_DMABUF;
+ * @m.fd:		for non-multiplanar buffers with memory == V4L2_MEMORY_DMABUF;
  *		a userspace file descriptor associated with this buffer
- * @planes:	for multiplanar buffers; userspace pointer to the array of plane
+ * @m.planes:	for multiplanar buffers; userspace pointer to the array of plane
  *		info structs for this buffer
  * @m:		union of @offset, @userptr, @planes and @fd
  * @length:	size in bytes of the buffer (NOT its payload) for single-plane
@@ -2423,15 +2423,15 @@ struct v4l2_meta_format {
 
 /**
  * struct v4l2_format - stream data format
- * @type:	enum v4l2_buf_type; type of the data stream
- * @pix:	definition of an image format
- * @pix_mp:	definition of a multiplanar image format
- * @win:	definition of an overlaid image
- * @vbi:	raw VBI capture or output parameters
- * @sliced:	sliced VBI capture or output parameters
- * @raw_data:	placeholder for future extensions and custom formats
- * @fmt:	union of @pix, @pix_mp, @win, @vbi, @sliced, @sdr, @meta
- *		and @raw_data
+ * @type:		enum v4l2_buf_type; type of the data stream
+ * @fmt.pix:		definition of an image format
+ * @fmt.pix_mp:		definition of a multiplanar image format
+ * @fmt.win:		definition of an overlaid image
+ * @fmt.vbi:		raw VBI capture or output parameters
+ * @fmt.sliced:		sliced VBI capture or output parameters
+ * @fmt.raw_data:	placeholder for future extensions and custom formats
+ * @fmt:		union of @pix, @pix_mp, @win, @vbi, @sliced, @sdr,
+ *			@meta and @raw_data
  */
 struct v4l2_format {
 	__u32	 type;
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by Tested-by on v1 2/17
#5 lore raw

Re: [PATCH 02/17] media: videodev2.h: Fix kerneldoc

Quoted 4 lines · Ricardo Ribalda

Named nested unions need their prefix:
https://www.kernel.org/doc/html/latest/doc-guide/kernel-doc.html#nested-structs-unions

Thanks.

Quoted 70 lines
---
 include/uapi/linux/videodev2.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
include/uapi/linux/videodev2.h +16 -16
index 68e7ac178cc2..a8015e5e7fa4 100644
@@ -1041,13 +1041,13 @@ struct v4l2_requestbuffers {
  * struct v4l2_plane - plane info for multi-planar buffers
  * @bytesused:		number of bytes occupied by data in the plane (payload)
  * @length:		size of this plane (NOT the payload) in bytes
- * @mem_offset:		when memory in the associated struct v4l2_buffer is
+ * @m.mem_offset:	when memory in the associated struct v4l2_buffer is
  *			V4L2_MEMORY_MMAP, equals the offset from the start of
  *			the device memory for this plane (or is a "cookie" that
  *			should be passed to mmap() called on the video node)
- * @userptr:		when memory is V4L2_MEMORY_USERPTR, a userspace pointer
+ * @m.userptr:		when memory is V4L2_MEMORY_USERPTR, a userspace pointer
  *			pointing to this plane
- * @fd:			when memory is V4L2_MEMORY_DMABUF, a userspace file
+ * @m.fd:		when memory is V4L2_MEMORY_DMABUF, a userspace file
  *			descriptor associated with this plane
  * @m:			union of @mem_offset, @userptr and @fd
  * @data_offset:	offset in the plane to the start of data; usually 0,
@@ -1085,14 +1085,14 @@ struct v4l2_plane {
  * @sequence:	sequence count of this frame
  * @memory:	enum v4l2_memory; the method, in which the actual video data is
  *		passed
- * @offset:	for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
+ * @m.offset:	for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
  *		offset from the start of the device memory for this plane,
  *		(or a "cookie" that should be passed to mmap() as offset)
- * @userptr:	for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
+ * @m.userptr:	for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
  *		a userspace pointer pointing to this buffer
- * @fd:		for non-multiplanar buffers with memory == V4L2_MEMORY_DMABUF;
+ * @m.fd:		for non-multiplanar buffers with memory == V4L2_MEMORY_DMABUF;
  *		a userspace file descriptor associated with this buffer
- * @planes:	for multiplanar buffers; userspace pointer to the array of plane
+ * @m.planes:	for multiplanar buffers; userspace pointer to the array of plane
  *		info structs for this buffer
  * @m:		union of @offset, @userptr, @planes and @fd
  * @length:	size in bytes of the buffer (NOT its payload) for single-plane
@@ -2423,15 +2423,15 @@ struct v4l2_meta_format {
 
 /**
  * struct v4l2_format - stream data format
- * @type:	enum v4l2_buf_type; type of the data stream
- * @pix:	definition of an image format
- * @pix_mp:	definition of a multiplanar image format
- * @win:	definition of an overlaid image
- * @vbi:	raw VBI capture or output parameters
- * @sliced:	sliced VBI capture or output parameters
- * @raw_data:	placeholder for future extensions and custom formats
- * @fmt:	union of @pix, @pix_mp, @win, @vbi, @sliced, @sdr, @meta
- *		and @raw_data
+ * @type:		enum v4l2_buf_type; type of the data stream
+ * @fmt.pix:		definition of an image format
+ * @fmt.pix_mp:		definition of a multiplanar image format
+ * @fmt.win:		definition of an overlaid image
+ * @fmt.vbi:		raw VBI capture or output parameters
+ * @fmt.sliced:		sliced VBI capture or output parameters
+ * @fmt.raw_data:	placeholder for future extensions and custom formats
+ * @fmt:		union of @pix, @pix_mp, @win, @vbi, @sliced, @sdr,
+ *			@meta and @raw_data
  */
 struct v4l2_format {
 	__u32	 type;
Signature · 1 line
#Randy
#7 lore raw

PATCH 3/17 media: media-entity.h: Fix kerneldoc

In reply to Ricardo Ribalda

The fields seems to be documented twice.

---
 include/media/media-entity.h | 4 ----
 1 file changed, 4 deletions(-)
include/media/media-entity.h +0 -4
index 2b6cd343ee9e..c79176ed6299 100644
@@ -337,10 +337,6 @@ enum media_entity_type {
  * @info.dev:	Contains device major and minor info.
  * @info.dev.major: device node major, if the device is a devnode.
  * @info.dev.minor: device node minor, if the device is a devnode.
- * @major:	Devnode major number (zero if not applicable). Kept just
- *		for backward compatibility.
- * @minor:	Devnode minor number (zero if not applicable). Kept just
- *		for backward compatibility.
  *
  * .. note::
  *
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by Laurent Pinchart on v1 3/17
#8 lore raw

Re: [PATCH 03/17] media: media-entity.h: Fix kerneldoc

Quoted 13 lines · Ricardo Ribalda

The fields seems to be documented twice.

---
 include/media/media-entity.h | 4 ----
 1 file changed, 4 deletions(-)
include/media/media-entity.h +0 -0
index 2b6cd343ee9e..c79176ed6299 100644

include/media/media-entity.h enum media_entity_type { · line 342

Quoted 10 lines
include/media/media-entity.h +0 -4
@@ -337,10 +337,6 @@ enum media_entity_type {
  * @info.dev:	Contains device major and minor info.
  * @info.dev.major: device node major, if the device is a devnode.
  * @info.dev.minor: device node minor, if the device is a devnode.
- * @major:	Devnode major number (zero if not applicable). Kept just
- *		for backward compatibility.
- * @minor:	Devnode minor number (zero if not applicable). Kept just
- *		for backward compatibility.
  *
  * .. note::
  *

I'd say that this is correct based on
https://patchwork.kernel.org/project/linux-media/patch/[email protected]/

Hans, can you please explain this message from you, on 2024-Jan-22, that I cannot find in the media patchwork:

Subject: [git:media_stage/master] media: media-entity.h: fix Excess kernel-doc description warnings

This is an automatic generated email to let you know that the following patch were queued:

Subject: media: media-entity.h: fix Excess kernel-doc description warnings
Author:  Randy Dunlap <[email protected]>
Date:    Fri Dec 22 21:07:07 2023 -0800

Remove the @major: and @minor: lines to prevent the kernel-doc warnings:

include/media/media-entity.h:376: warning: Excess struct member 'major' description in 'media_entity' include/media/media-entity.h:376: warning: Excess struct member 'minor' description in 'media_entity'

 include/media/media-entity.h | 4 ----
 1 file changed, 4 deletions(-)

---

include/media/media-entity.h +0 -4
index 2b6cd343ee9e..c79176ed6299 100644
@@ -337,10 +337,6 @@ enum media_entity_type {
  * @info.dev:	Contains device major and minor info.
  * @info.dev.major: device node major, if the device is a devnode.
  * @info.dev.minor: device node minor, if the device is a devnode.
- * @major:	Devnode major number (zero if not applicable). Kept just
- *		for backward compatibility.
- * @minor:	Devnode minor number (zero if not applicable). Kept just
- *		for backward compatibility.
  *
  * .. note::
  *

Thanks.

Signature · 1 line
#Randy
maintainer
#9 lore raw

Re: [PATCH 03/17] media: media-entity.h: Fix kerneldoc

Hi Randy,

Quoted 31 lines · Randy Dunlap
Quoted 13 lines · Ricardo Ribalda

The fields seems to be documented twice.

---
 include/media/media-entity.h | 4 ----
 1 file changed, 4 deletions(-)
include/media/media-entity.h +0 -0
index 2b6cd343ee9e..c79176ed6299 100644

include/media/media-entity.h enum media_entity_type { · line 342

Quoted 10 lines
include/media/media-entity.h +0 -4
@@ -337,10 +337,6 @@ enum media_entity_type {
  * @info.dev:	Contains device major and minor info.
  * @info.dev.major: device node major, if the device is a devnode.
  * @info.dev.minor: device node minor, if the device is a devnode.
- * @major:	Devnode major number (zero if not applicable). Kept just
- *		for backward compatibility.
- * @minor:	Devnode minor number (zero if not applicable). Kept just
- *		for backward compatibility.
  *
  * .. note::
  *

I'd say that this is correct based on
https://patchwork.kernel.org/project/linux-media/patch/[email protected]/

Quoted 2 lines

Hans, can you please explain this message from you, on 2024-Jan-22, that I cannot find in the media patchwork:

It's in linuxtv.org Patchwork here <URL:https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/> and also in the media stage tree (as indicated by the state) but not yet in
master AFAIU.

Quoted 46 lines

Subject: [git:media_stage/master] media: media-entity.h: fix Excess kernel-doc description warnings

This is an automatic generated email to let you know that the following patch were queued:

Subject: media: media-entity.h: fix Excess kernel-doc description warnings
Author:  Randy Dunlap <[email protected]>
Date:    Fri Dec 22 21:07:07 2023 -0800

Remove the @major: and @minor: lines to prevent the kernel-doc warnings:

include/media/media-entity.h:376: warning: Excess struct member 'major' description in 'media_entity' include/media/media-entity.h:376: warning: Excess struct member 'minor' description in 'media_entity'

 include/media/media-entity.h | 4 ----
 1 file changed, 4 deletions(-)

---

include/media/media-entity.h +0 -4
index 2b6cd343ee9e..c79176ed6299 100644
@@ -337,10 +337,6 @@ enum media_entity_type {
  * @info.dev:	Contains device major and minor info.
  * @info.dev.major: device node major, if the device is a devnode.
  * @info.dev.minor: device node minor, if the device is a devnode.
- * @major:	Devnode major number (zero if not applicable). Kept just
- *		for backward compatibility.
- * @minor:	Devnode minor number (zero if not applicable). Kept just
- *		for backward compatibility.
  *
  * .. note::
  *

Thanks.

Signature · 3 lines
Regards,

Sakari Ailus
reviewer
#10 lore raw

Re: [PATCH 03/17] media: media-entity.h: Fix kerneldoc

Quoted 33 lines · Sakari Ailus

Hi Randy,

Quoted 30 lines · Randy Dunlap
Quoted 13 lines · Ricardo Ribalda

The fields seems to be documented twice.

---
 include/media/media-entity.h | 4 ----
 1 file changed, 4 deletions(-)
include/media/media-entity.h +0 -0
index 2b6cd343ee9e..c79176ed6299 100644

include/media/media-entity.h enum media_entity_type { · line 342

Quoted 10 lines
include/media/media-entity.h +0 -4
@@ -337,10 +337,6 @@ enum media_entity_type {
  * @info.dev:	Contains device major and minor info.
  * @info.dev.major: device node major, if the device is a devnode.
  * @info.dev.minor: device node minor, if the device is a devnode.
- * @major:	Devnode major number (zero if not applicable). Kept just
- *		for backward compatibility.
- * @minor:	Devnode minor number (zero if not applicable). Kept just
- *		for backward compatibility.
  *
  * .. note::
  *

I'd say that this is correct based on
https://patchwork.kernel.org/project/linux-media/patch/[email protected]/

Ah, I see. Thank you.

Quoted 56 lines
Quoted 3 lines

Hans, can you please explain this message from you, on 2024-Jan-22, that I cannot find in the media patchwork:

It's in linuxtv.org Patchwork here <URL:https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/> and also in the media stage tree (as indicated by the state) but not yet in
master AFAIU.

Quoted 46 lines

Subject: [git:media_stage/master] media: media-entity.h: fix Excess kernel-doc description warnings

This is an automatic generated email to let you know that the following patch were queued:

Subject: media: media-entity.h: fix Excess kernel-doc description warnings
Author:  Randy Dunlap <[email protected]>
Date:    Fri Dec 22 21:07:07 2023 -0800

Remove the @major: and @minor: lines to prevent the kernel-doc warnings:

include/media/media-entity.h:376: warning: Excess struct member 'major' description in 'media_entity' include/media/media-entity.h:376: warning: Excess struct member 'minor' description in 'media_entity'

 include/media/media-entity.h | 4 ----
 1 file changed, 4 deletions(-)

---

include/media/media-entity.h +0 -4
index 2b6cd343ee9e..c79176ed6299 100644
@@ -337,10 +337,6 @@ enum media_entity_type {
  * @info.dev:	Contains device major and minor info.
  * @info.dev.major: device node major, if the device is a devnode.
  * @info.dev.minor: device node minor, if the device is a devnode.
- * @major:	Devnode major number (zero if not applicable). Kept just
- *		for backward compatibility.
- * @minor:	Devnode minor number (zero if not applicable). Kept just
- *		for backward compatibility.
  *
  * .. note::
  *

Thanks.

Signature · 1 line
#Randy
#11 lore raw

Re: [PATCH 03/17] media: media-entity.h: Fix kerneldoc

In reply to Ricardo Ribalda

Hi Ricardo,

Thanks for the patchset.

Quoted 12 lines · Ricardo Ribalda

The fields seems to be documented twice.

---
 include/media/media-entity.h | 4 ----
 1 file changed, 4 deletions(-)
include/media/media-entity.h +0 -0
index 2b6cd343ee9e..c79176ed6299 100644

include/media/media-entity.h enum media_entity_type { · line 343

Quoted 7 lines
include/media/media-entity.h +0 -4
@@ -337,10 +337,6 @@ enum media_entity_type {
  * @info.dev:	Contains device major and minor info.
  * @info.dev.major: device node major, if the device is a devnode.
  * @info.dev.minor: device node minor, if the device is a devnode.
- * @major:	Devnode major number (zero if not applicable). Kept just
- *		for backward compatibility.
- * @minor:	Devnode minor number (zero if not applicable). Kept just
- *		for backward compatibility.

A similar patch by Randy Dunlap was recently merged. You can drop this one.

Quoted 4 lines
include/media/media-entity.h +0 -0
  *
  * .. note::
  *
Signature · 3 lines
Kind regards,

Sakari Ailus
#12 lore raw

PATCH 4/17 media: cec.h: Fix kerneldoc

In reply to Ricardo Ribalda

The fields are gone, remove their documentation.

---
 include/media/cec.h | 2 --
 1 file changed, 2 deletions(-)
include/media/cec.h +0 -2
index d77982685116..10c9cf6058b7 100644
@@ -224,8 +224,6 @@ struct cec_adap_ops {
  * @notifier:		CEC notifier
  * @pin:		CEC pin status struct
  * @cec_dir:		debugfs cec directory
- * @status_file:	debugfs cec status file
- * @error_inj_file:	debugfs cec error injection file
  * @sequence:		transmit sequence counter
  * @input_phys:		remote control input_phys name
  *
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 4/17
#13 lore raw

Re: [PATCH 04/17] media: cec.h: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

The fields are gone, remove their documentation.

Thanks.

Quoted 18 lines
---
 include/media/cec.h | 2 --
 1 file changed, 2 deletions(-)
include/media/cec.h +0 -2
index d77982685116..10c9cf6058b7 100644
@@ -224,8 +224,6 @@ struct cec_adap_ops {
  * @notifier:		CEC notifier
  * @pin:		CEC pin status struct
  * @cec_dir:		debugfs cec directory
- * @status_file:	debugfs cec status file
- * @error_inj_file:	debugfs cec error injection file
  * @sequence:		transmit sequence counter
  * @input_phys:		remote control input_phys name
  *
Signature · 1 line
#Randy
#14 lore raw

PATCH 5/17 media: pci: dt315.h: Fix kerneldoc

In reply to Ricardo Ribalda

The field is gone, remove it.

---
 drivers/media/pci/dt3155/dt3155.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/pci/dt3155/dt3155.h +0 -1
index c9ce79cb5566..ce1835d9691e 100644
@@ -162,7 +162,6 @@
  * @height:		frame height
  * @input:		current input
  * @sequence:		frame counter
- * @stats:		statistics structure
  * @regs:		local copy of mmio base register
  * @csr2:		local copy of csr2 register
  * @config:		local copy of config register
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 5/17
#15 lore raw

Re: [PATCH 05/17] media: pci: dt315.h: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

The field is gone, remove it.

Thanks.

Quoted 17 lines
---
 drivers/media/pci/dt3155/dt3155.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/pci/dt3155/dt3155.h +0 -1
index c9ce79cb5566..ce1835d9691e 100644
@@ -162,7 +162,6 @@
  * @height:		frame height
  * @input:		current input
  * @sequence:		frame counter
- * @stats:		statistics structure
  * @regs:		local copy of mmio base register
  * @csr2:		local copy of csr2 register
  * @config:		local copy of config register
Signature · 1 line
#Randy
#16 lore raw

PATCH 6/17 media: i2c: css-quirk.h: Fix kerneldoc

In reply to Ricardo Ribalda

Kerneldoc does not seem to understand that embed doc:
drivers/media/i2c/ccs/ccs-quirk.h:50: warning: Excess struct member 'write' description in 'ccs_quirk' drivers/media/i2c/ccs/ccs-quirk.h:50: warning: Excess struct member 'reg' description in 'ccs_quirk' drivers/media/i2c/ccs/ccs-quirk.h:50: warning: Excess struct member 'val' description in 'ccs_quirk'

Convert into a standard doc.

---
 drivers/media/i2c/ccs/ccs-quirk.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/i2c/ccs/ccs-quirk.h +4 -4
index 0b1a64958d71..392c97109617 100644
@@ -28,11 +28,11 @@ struct ccs_sensor;
  * @reg_access: Register access quirk. The quirk may divert the access
  *		to another register, or no register at all.
  *
- *		@write: Is this read (false) or write (true) access?
- *		@reg: Pointer to the register to access
- *		@value: Register value, set by the caller on write, or
+ *		-write: Is this read (false) or write (true) access?
+ *		-reg:   Pointer to the register to access
+ *		-val:   Register value, set by the caller on write, or
  *			by the quirk on read
- *		@return: 0 on success, -ENOIOCTLCMD if no register
+ *		-return: 0 on success, -ENOIOCTLCMD if no register
  *			 access may be done by the caller (default read
  *			 value is zero), else negative error code on error
  * @flags: Quirk flags
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 6/17
#17 lore raw

Re: [PATCH 06/17] media: i2c: css-quirk.h: Fix kerneldoc

Quoted 5 lines · Ricardo Ribalda

Kerneldoc does not seem to understand that embed doc:
drivers/media/i2c/ccs/ccs-quirk.h:50: warning: Excess struct member 'write' description in 'ccs_quirk' drivers/media/i2c/ccs/ccs-quirk.h:50: warning: Excess struct member 'reg' description in 'ccs_quirk' drivers/media/i2c/ccs/ccs-quirk.h:50: warning: Excess struct member 'val' description in 'ccs_quirk'

Correct. It's never tried to understand that AFAIK.

Quoted 3 lines

Convert into a standard doc.

Thanks.

Quoted 25 lines
---
 drivers/media/i2c/ccs/ccs-quirk.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/i2c/ccs/ccs-quirk.h +4 -4
index 0b1a64958d71..392c97109617 100644
@@ -28,11 +28,11 @@ struct ccs_sensor;
  * @reg_access: Register access quirk. The quirk may divert the access
  *		to another register, or no register at all.
  *
- *		@write: Is this read (false) or write (true) access?
- *		@reg: Pointer to the register to access
- *		@value: Register value, set by the caller on write, or
+ *		-write: Is this read (false) or write (true) access?
+ *		-reg:   Pointer to the register to access
+ *		-val:   Register value, set by the caller on write, or
  *			by the quirk on read
- *		@return: 0 on success, -ENOIOCTLCMD if no register
+ *		-return: 0 on success, -ENOIOCTLCMD if no register
  *			 access may be done by the caller (default read
  *			 value is zero), else negative error code on error
  * @flags: Quirk flags
Signature · 1 line
#Randy
#18 lore raw

PATCH 7/17 media: i2c: adv748: Fix kerneldoc

In reply to Ricardo Ribalda

The field is gone, remove the documentation.

---
 drivers/media/i2c/adv748x/adv748x.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/i2c/adv748x/adv748x.h +0 -1
index 6f90f78f58cf..d2b5e722e997 100644
@@ -173,7 +173,6 @@ struct adv748x_afe {
  *
  * @endpoints:		parsed device node endpoints for each port
  *
- * @i2c_addresses:	I2C Page addresses
  * @i2c_clients:	I2C clients for the page accesses
  * @regmap:		regmap configuration pages.
  *
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 7/17
#19 lore raw

Re: [PATCH 07/17] media: i2c: adv748: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

The field is gone, remove the documentation.

Thanks.

Quoted 17 lines
---
 drivers/media/i2c/adv748x/adv748x.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/i2c/adv748x/adv748x.h +0 -1
index 6f90f78f58cf..d2b5e722e997 100644
@@ -173,7 +173,6 @@ struct adv748x_afe {
  *
  * @endpoints:		parsed device node endpoints for each port
  *
- * @i2c_addresses:	I2C Page addresses
  * @i2c_clients:	I2C clients for the page accesses
  * @regmap:		regmap configuration pages.
  *
Signature · 1 line
#Randy
maintainer Reviewed-by on v1 7/17
#20 lore raw

Re: [PATCH 07/17] media: i2c: adv748: Fix kerneldoc

In reply to Ricardo Ribalda

Quoting Ricardo Ribalda (2024-01-26 23:16:06)

Quoted 1 line

The field is gone, remove the documentation.

Looking at 3e89586a64df ("media: i2c: adv748x: add adv748x driver") confims it was never added. Must have been an old leftover when I upstreamed.

Thanks for the fix.

Quoted 21 lines
---
 drivers/media/i2c/adv748x/adv748x.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/i2c/adv748x/adv748x.h +0 -1
index 6f90f78f58cf..d2b5e722e997 100644
@@ -173,7 +173,6 @@ struct adv748x_afe {
  *
  * @endpoints:         parsed device node endpoints for each port
  *
- * @i2c_addresses:     I2C Page addresses
  * @i2c_clients:       I2C clients for the page accesses
  * @regmap:            regmap configuration pages.
  *
Signature · 2 lines
-- 
2.43.0.429.g432eaa2c6b-goog
#21 lore raw

PATCH 8/17 media: mediatek: jpeg: Fix kerneldoc

In reply to Ricardo Ribalda

The field is gone, remove the documentation for it.

---
 drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h +0 -1
index 8ba6e757e11a..8877eb39e807 100644
@@ -144,7 +144,6 @@ struct mtk_jpegdec_clk {
  * @jpegenc_irq:	jpeg encode irq num
  * @job_timeout_work:	encode timeout workqueue
  * @hw_param:		jpeg encode hw parameters
- * @hw_rdy:		record hw ready
  * @hw_state:		record hw state
  * @hw_lock:		spinlock protecting the hw device resource
  */
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 8/17
#22 lore raw

Re: [PATCH 08/17] media: mediatek: jpeg: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

The field is gone, remove the documentation for it.

Thanks.

Quoted 17 lines
---
 drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h +0 -1
index 8ba6e757e11a..8877eb39e807 100644
@@ -144,7 +144,6 @@ struct mtk_jpegdec_clk {
  * @jpegenc_irq:	jpeg encode irq num
  * @job_timeout_work:	encode timeout workqueue
  * @hw_param:		jpeg encode hw parameters
- * @hw_rdy:		record hw ready
  * @hw_state:		record hw state
  * @hw_lock:		spinlock protecting the hw device resource
  */
Signature · 1 line
#Randy
#24 lore raw

PATCH 9/17 media: mediatek: vcodec: Fix kerneldoc

In reply to Ricardo Ribalda

Those fields have been removed. They do not need to be documented.

---
 drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.h | 1 -
 drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h    | 1 -
 drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.h | 1 -
 3 files changed, 3 deletions(-)
drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.h +0 -1
index ece27c880e50..1af075fc0194 100644
@@ -39,7 +39,6 @@ struct vdec_fb {
 /**
  * struct mtk_video_dec_buf - Private data related to each VB2 buffer.
  * @m2m_buf:	M2M buffer
- * @list:	link list
  * @used:	Capture buffer contain decoded frame data and keep in
  *			codec data structure
  * @queued_in_vb2:	Capture buffer is queue in vb2
drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h +0 -1
index fbb3f34a73f0..aa7d08afc2f4 100644
@@ -22,7 +22,6 @@ struct mtk_vcodec_dec_ctx;
  *                in place of inst_addr in messages.
  * @signaled    : 1 - Host has received ack message from VPU, 0 - not received
  * @ctx         : context for v4l2 layer integration
- * @dev		: platform device of VPU
  * @wq          : wait queue to wait VPU message ack
  * @handler     : ipi handler for each decoder
  * @codec_type     : use codec type to separate different codecs
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.h +0 -1
index 82246401ed4a..908d8179b2d2 100644
@@ -26,7 +26,6 @@
 /**
  * struct mtk_video_enc_buf - Private data related to each VB2 buffer.
  * @m2m_buf:	M2M buffer
- * @list:	list that buffer link to
  * @param_change: Types of encode parameter change before encoding this
  *				buffer
  * @enc_params: Encode parameters changed before encode this buffer
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 9/17
#25 lore raw

Re: [PATCH 09/17] media: mediatek: vcodec: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

Those fields have been removed. They do not need to be documented.

Thanks.

Quoted 43 lines
---
 drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.h | 1 -
 drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h    | 1 -
 drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.h | 1 -
 3 files changed, 3 deletions(-)
drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.h +0 -1
index ece27c880e50..1af075fc0194 100644
@@ -39,7 +39,6 @@ struct vdec_fb {
 /**
  * struct mtk_video_dec_buf - Private data related to each VB2 buffer.
  * @m2m_buf:	M2M buffer
- * @list:	link list
  * @used:	Capture buffer contain decoded frame data and keep in
  *			codec data structure
  * @queued_in_vb2:	Capture buffer is queue in vb2
drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h +0 -1
index fbb3f34a73f0..aa7d08afc2f4 100644
@@ -22,7 +22,6 @@ struct mtk_vcodec_dec_ctx;
  *                in place of inst_addr in messages.
  * @signaled    : 1 - Host has received ack message from VPU, 0 - not received
  * @ctx         : context for v4l2 layer integration
- * @dev		: platform device of VPU
  * @wq          : wait queue to wait VPU message ack
  * @handler     : ipi handler for each decoder
  * @codec_type     : use codec type to separate different codecs
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.h +0 -1
index 82246401ed4a..908d8179b2d2 100644
@@ -26,7 +26,6 @@
 /**
  * struct mtk_video_enc_buf - Private data related to each VB2 buffer.
  * @m2m_buf:	M2M buffer
- * @list:	list that buffer link to
  * @param_change: Types of encode parameter change before encoding this
  *				buffer
  * @enc_params: Encode parameters changed before encode this buffer
Signature · 1 line
#Randy
#27 lore raw

PATCH 10/17 media: verisilicon: Fix kerneldoc

In reply to Ricardo Ribalda

The field is not part of the structure. Remove the doc.

---
 drivers/media/platform/verisilicon/hantro.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/platform/verisilicon/hantro.h +0 -1
index 6f5eb975d0e3..811260dc3c77 100644
@@ -237,7 +237,6 @@ struct hantro_dev {
  * @codec_ops:		Set of operations related to codec mode.
  * @postproc:		Post-processing context.
  * @h264_dec:		H.264-decoding context.
- * @jpeg_enc:		JPEG-encoding context.
  * @mpeg2_dec:		MPEG-2-decoding context.
  * @vp8_dec:		VP8-decoding context.
  * @hevc_dec:		HEVC-decoding context.
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 10/17
#28 lore raw

Re: [PATCH 10/17] media: verisilicon: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

The field is not part of the structure. Remove the doc.

Thanks.

Quoted 17 lines
---
 drivers/media/platform/verisilicon/hantro.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/platform/verisilicon/hantro.h +0 -1
index 6f5eb975d0e3..811260dc3c77 100644
@@ -237,7 +237,6 @@ struct hantro_dev {
  * @codec_ops:		Set of operations related to codec mode.
  * @postproc:		Post-processing context.
  * @h264_dec:		H.264-decoding context.
- * @jpeg_enc:		JPEG-encoding context.
  * @mpeg2_dec:		MPEG-2-decoding context.
  * @vp8_dec:		VP8-decoding context.
  * @hevc_dec:		HEVC-decoding context.
Signature · 1 line
#Randy
#29 lore raw

PATCH 11/17 media: qcom: venus: Fix kerneldoc

In reply to Ricardo Ribalda

Remove doc for missing field.

---
 drivers/media/platform/qcom/venus/core.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/platform/qcom/venus/core.h +0 -1
index 4a633261ece4..a39986ce79f1 100644
@@ -428,7 +428,6 @@ enum venus_inst_modes {
  * @error:	an error returned during last HFI sync operation
  * @session_error:	a flag rised by HFI interface in case of session error
  * @ops:		HFI operations
- * @priv:	a private for HFI operations callbacks
  * @session_type:	the type of the session (decoder or encoder)
  * @hprop:	a union used as a holder by get property
  * @core_acquired:	the Core has been acquired
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer
#30 lore raw

Re: [PATCH 11/17] media: qcom: venus: Fix kerneldoc

Hi,

Quoted 13 lines · Ricardo Ribalda

Remove doc for missing field.

---
 drivers/media/platform/qcom/venus/core.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/platform/qcom/venus/core.h +0 -0
index 4a633261ece4..a39986ce79f1 100644

drivers/media/platform/qcom/venus/core.h enum venus_inst_modes { · line 433

Quoted 7 lines
drivers/media/platform/qcom/venus/core.h +0 -1
@@ -428,7 +428,6 @@ enum venus_inst_modes {
  * @error:	an error returned during last HFI sync operation
  * @session_error:	a flag rised by HFI interface in case of session error
  * @ops:		HFI operations
- * @priv:	a private for HFI operations callbacks
  * @session_type:	the type of the session (decoder or encoder)
  * @hprop:	a union used as a holder by get property
  * @core_acquired:	the Core has been acquired

I don't understand this one. I do understand the patch above, but the in the struct, I see:

	unsigned long enc_codecs;
	unsigned long dec_codecs;
	unsigned int max_sessions_supported;
	void *priv;
	const struct hfi_ops *ops;
	struct delayed_work work;

I'm just guessing, but maybe scripts/kernel-doc is confused....

Signature · 1 line
#Randy
reviewer Reviewed-by
#31 lore raw

Re: [PATCH 11/17] media: qcom: venus: Fix kerneldoc

Quoted 27 lines · Randy Dunlap

Hi,

Quoted 13 lines · Ricardo Ribalda

Remove doc for missing field.

---
 drivers/media/platform/qcom/venus/core.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/platform/qcom/venus/core.h +0 -0
index 4a633261ece4..a39986ce79f1 100644

drivers/media/platform/qcom/venus/core.h enum venus_inst_modes { · line 433

Quoted 7 lines
drivers/media/platform/qcom/venus/core.h +0 -1
@@ -428,7 +428,6 @@ enum venus_inst_modes {
  * @error:	an error returned during last HFI sync operation
  * @session_error:	a flag rised by HFI interface in case of session error
  * @ops:		HFI operations
- * @priv:	a private for HFI operations callbacks
  * @session_type:	the type of the session (decoder or encoder)
  * @hprop:	a union used as a holder by get property
  * @core_acquired:	the Core has been acquired

I don't understand this one. I do understand the patch above, but the in the struct, I see:

Quoted 9 lines
	unsigned long enc_codecs;
	unsigned long dec_codecs;
	unsigned int max_sessions_supported;
	void *priv;
	const struct hfi_ops *ops;
	struct delayed_work work;

I'm just guessing, but maybe scripts/kernel-doc is confused....

Nope, I'm confused. The patch is correct.
Thanks.

Signature · 1 line
#Randy
#32 lore raw

PATCH 12/17 media: samsung: exynos4-is: Fix kerneldoc

In reply to Ricardo Ribalda

Remove doc from missing fields.

---
 drivers/media/platform/samsung/exynos4-is/fimc-lite.h | 3 ---
 1 file changed, 3 deletions(-)
drivers/media/platform/samsung/exynos4-is/fimc-lite.h +0 -3
index ddf29e0b5b1c..2d96fb00a5c6 100644
@@ -117,8 +117,6 @@ struct flite_buffer {
  * @ctrl_handler: v4l2 control handler
  * @test_pattern: test pattern controls
  * @index: FIMC-LITE platform device index
- * @pipeline: video capture pipeline data structure
- * @pipeline_ops: media pipeline ops for the video node driver
  * @slock: spinlock protecting this data structure and the hw registers
  * @lock: mutex serializing video device and the subdev operations
  * @clock: FIMC-LITE gate clock
@@ -134,7 +132,6 @@ struct flite_buffer {
  * @active_buf_q: the queue head of buffers scheduled in hardware
  * @vb_queue: vb2 buffers queue
  * @buf_index: helps to keep track of the DMA start address register index
- * @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
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 12/17
#33 lore raw

Re: [PATCH 12/17] media: samsung: exynos4-is: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

Remove doc from missing fields.

Thanks.

Quoted 26 lines
---
 drivers/media/platform/samsung/exynos4-is/fimc-lite.h | 3 ---
 1 file changed, 3 deletions(-)
drivers/media/platform/samsung/exynos4-is/fimc-lite.h +0 -3
index ddf29e0b5b1c..2d96fb00a5c6 100644
@@ -117,8 +117,6 @@ struct flite_buffer {
  * @ctrl_handler: v4l2 control handler
  * @test_pattern: test pattern controls
  * @index: FIMC-LITE platform device index
- * @pipeline: video capture pipeline data structure
- * @pipeline_ops: media pipeline ops for the video node driver
  * @slock: spinlock protecting this data structure and the hw registers
  * @lock: mutex serializing video device and the subdev operations
  * @clock: FIMC-LITE gate clock
@@ -134,7 +132,6 @@ struct flite_buffer {
  * @active_buf_q: the queue head of buffers scheduled in hardware
  * @vb_queue: vb2 buffers queue
  * @buf_index: helps to keep track of the DMA start address register index
- * @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
Signature · 1 line
#Randy
#34 lore raw

PATCH 13/17 media: samsung: s5p-mfc: Fix kerneldoc

In reply to Ricardo Ribalda

Remove doc from missing fields.

---
 drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h +0 -1
index 59450b324f7d..7e7e7b695b53 100644
@@ -612,7 +612,6 @@ struct s5p_mfc_codec_ops {
  * @chroma_dpb_size:	dpb buffer size for chroma
  * @me_buffer_size:	size of the motion estimation buffer
  * @tmv_buffer_size:	size of temporal predictor motion vector buffer
- * @frame_type:		used to force the type of the next encoded frame
  * @ref_queue:		list of the reference buffers for encoding
  * @force_frame_type:	encoder's frame type forcing control
  * @ref_queue_cnt:	number of the buffers in the reference list
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 13/17
#35 lore raw

Re: [PATCH 13/17] media: samsung: s5p-mfc: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

Remove doc from missing fields.

Thanks.

Quoted 17 lines
---
 drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h | 1 -
 1 file changed, 1 deletion(-)
drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h +0 -1
index 59450b324f7d..7e7e7b695b53 100644
@@ -612,7 +612,6 @@ struct s5p_mfc_codec_ops {
  * @chroma_dpb_size:	dpb buffer size for chroma
  * @me_buffer_size:	size of the motion estimation buffer
  * @tmv_buffer_size:	size of temporal predictor motion vector buffer
- * @frame_type:		used to force the type of the next encoded frame
  * @ref_queue:		list of the reference buffers for encoding
  * @force_frame_type:	encoder's frame type forcing control
  * @ref_queue_cnt:	number of the buffers in the reference list
Signature · 1 line
#Randy
#36 lore raw

PATCH 14/17 media: dvb-usb: Fix kerneldoc

In reply to Ricardo Ribalda

Remove kerneldoc from missing fields.

---
 drivers/media/usb/dvb-usb/dvb-usb.h | 2 --
 1 file changed, 2 deletions(-)
drivers/media/usb/dvb-usb/dvb-usb.h +0 -2
index 0990aa4a17bb..cbb0541d4dc1 100644
@@ -126,8 +126,6 @@ struct usb_data_stream_properties {
  * @caps: capabilities of the DVB USB device.
  * @pid_filter_count: number of PID filter position in the optional hardware
  *  PID-filter.
- * @num_frontends: number of frontends of the DVB USB adapter.
- * @frontend_ctrl: called to power on/off active frontend.
  * @streaming_ctrl: called to start and stop the MPEG2-TS streaming of the
  *  device (not URB submitting/killing).
  *  This callback will be called without data URBs being active - data URBs
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 14/17
#37 lore raw

Re: [PATCH 14/17] media: dvb-usb: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

Remove kerneldoc from missing fields.

Thanks.

Quoted 18 lines
---
 drivers/media/usb/dvb-usb/dvb-usb.h | 2 --
 1 file changed, 2 deletions(-)
drivers/media/usb/dvb-usb/dvb-usb.h +0 -2
index 0990aa4a17bb..cbb0541d4dc1 100644
@@ -126,8 +126,6 @@ struct usb_data_stream_properties {
  * @caps: capabilities of the DVB USB device.
  * @pid_filter_count: number of PID filter position in the optional hardware
  *  PID-filter.
- * @num_frontends: number of frontends of the DVB USB adapter.
- * @frontend_ctrl: called to power on/off active frontend.
  * @streaming_ctrl: called to start and stop the MPEG2-TS streaming of the
  *  device (not URB submitting/killing).
  *  This callback will be called without data URBs being active - data URBs
Signature · 1 line
#Randy
#38 lore raw

PATCH 15/17 media: ipu3: Fix kerneldoc

In reply to Ricardo Ribalda

Remove documentation from missing fields.

---
 drivers/staging/media/ipu3/include/uapi/intel-ipu3.h | 3 ---
 1 file changed, 3 deletions(-)
drivers/staging/media/ipu3/include/uapi/intel-ipu3.h +0 -3
index caa358e0bae4..4aa2797f5e3c 100644
@@ -2485,11 +2485,9 @@ struct ipu3_uapi_anr_config {
  *		&ipu3_uapi_yuvp1_y_ee_nr_config
  * @yds:	y down scaler config. See &ipu3_uapi_yuvp1_yds_config
  * @chnr:	chroma noise reduction config. See &ipu3_uapi_yuvp1_chnr_config
- * @reserved1: reserved
  * @yds2:	y channel down scaler config. See &ipu3_uapi_yuvp1_yds_config
  * @tcc:	total color correction config as defined in struct
  *		&ipu3_uapi_yuvp2_tcc_static_config
- * @reserved2: reserved
  * @anr:	advanced noise reduction config.See &ipu3_uapi_anr_config
  * @awb_fr:	AWB filter response config. See ipu3_uapi_awb_fr_config
  * @ae:	auto exposure config  As specified by &ipu3_uapi_ae_config
@@ -2724,7 +2722,6 @@ struct ipu3_uapi_obgrid_param {
  * @acc_ae: 0 = no update, 1 = update.
  * @acc_af: 0 = no update, 1 = update.
  * @acc_awb: 0 = no update, 1 = update.
- * @__acc_osys: 0 = no update, 1 = update.
  * @reserved3: Not used.
  * @lin_vmem_params: 0 = no update, 1 = update.
  * @tnr3_vmem_params: 0 = no update, 1 = update.
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 15/17
#39 lore raw

Re: [PATCH 15/17] media: ipu3: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

Remove documentation from missing fields.

Thanks.

Quoted 29 lines
---
 drivers/staging/media/ipu3/include/uapi/intel-ipu3.h | 3 ---
 1 file changed, 3 deletions(-)
drivers/staging/media/ipu3/include/uapi/intel-ipu3.h +0 -3
index caa358e0bae4..4aa2797f5e3c 100644
@@ -2485,11 +2485,9 @@ struct ipu3_uapi_anr_config {
  *		&ipu3_uapi_yuvp1_y_ee_nr_config
  * @yds:	y down scaler config. See &ipu3_uapi_yuvp1_yds_config
  * @chnr:	chroma noise reduction config. See &ipu3_uapi_yuvp1_chnr_config
- * @reserved1: reserved
  * @yds2:	y channel down scaler config. See &ipu3_uapi_yuvp1_yds_config
  * @tcc:	total color correction config as defined in struct
  *		&ipu3_uapi_yuvp2_tcc_static_config
- * @reserved2: reserved
  * @anr:	advanced noise reduction config.See &ipu3_uapi_anr_config
  * @awb_fr:	AWB filter response config. See ipu3_uapi_awb_fr_config
  * @ae:	auto exposure config  As specified by &ipu3_uapi_ae_config
@@ -2724,7 +2722,6 @@ struct ipu3_uapi_obgrid_param {
  * @acc_ae: 0 = no update, 1 = update.
  * @acc_af: 0 = no update, 1 = update.
  * @acc_awb: 0 = no update, 1 = update.
- * @__acc_osys: 0 = no update, 1 = update.
  * @reserved3: Not used.
  * @lin_vmem_params: 0 = no update, 1 = update.
  * @tnr3_vmem_params: 0 = no update, 1 = update.
Signature · 1 line
#Randy
#40 lore raw

PATCH 16/17 media: staging: meson: Fix kerneldoc

In reply to Ricardo Ribalda

Remove documentation from missing field.

---
 drivers/staging/media/meson/vdec/vdec.h | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/media/meson/vdec/vdec.h +0 -1
index 0906b8fb5cc6..258685177700 100644
@@ -101,7 +101,6 @@ struct amvdec_core {
  * @conf_esparser: mandatory call to let the vdec configure the ESPARSER
  * @vififo_level: mandatory call to get the current amount of data
  *		  in the VIFIFO
- * @use_offsets: mandatory call. Returns 1 if the VDEC supports vififo offsets
  */
 struct amvdec_ops {
 	int (*start)(struct amvdec_session *sess);
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
reviewer Reviewed-by on v1 16/17
#41 lore raw

Re: [PATCH 16/17] media: staging: meson: Fix kerneldoc

Quoted 3 lines · Ricardo Ribalda

Remove documentation from missing field.

Thanks.

Quoted 17 lines
---
 drivers/staging/media/meson/vdec/vdec.h | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/media/meson/vdec/vdec.h +0 -1
index 0906b8fb5cc6..258685177700 100644
@@ -101,7 +101,6 @@ struct amvdec_core {
  * @conf_esparser: mandatory call to let the vdec configure the ESPARSER
  * @vififo_level: mandatory call to get the current amount of data
  *		  in the VIFIFO
- * @use_offsets: mandatory call. Returns 1 if the VDEC supports vififo offsets
  */
 struct amvdec_ops {
 	int (*start)(struct amvdec_session *sess);
Signature · 1 line
#Randy
#42 lore raw

PATCH 17/17 linux: v4l2-vp9.h: Fix kerneldoc

In reply to Ricardo Ribalda

Kerneldoc cannot understand arrays defined like
v4l2_frame_symbol_counts.

Adding an asterisk to the name does do the trick.

Disable the kerneldoc notation for now, it is already ignored:
https://docs.kernel.org/search.html?q=v4l2_vp9_frame_symbol_counts

include/media/v4l2-vp9.h:144: warning: Excess struct member 'partition' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'skip' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'intra_inter' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'tx32p' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'tx16p' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'tx8p' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'y_mode' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'uv_mode' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'comp' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'comp_ref' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'single_ref' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'mv_mode' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'filter' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'mv_joint' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'sign' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'classes' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'class0' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'bits' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'class0_fp' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'fp' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'class0_hp' description in 'v4l2_vp9_frame_symbol_counts' include/media/v4l2-vp9.h:144: warning: Excess struct member 'hp' description in 'v4l2_vp9_frame_symbol_counts'

---
 include/media/v4l2-vp9.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
include/media/v4l2-vp9.h +5 -1
index 05478ad6d4ab..f0d80273bd61 100644
@@ -83,7 +83,11 @@ struct v4l2_vp9_frame_context {
 	struct v4l2_vp9_frame_mv_context mv;
 };
 
-/**
+/*
+ * NOTE: This is not a kerneldoc, because the (*name) notation confuses the
+ *	 parser.
+ */
+/*
  * struct v4l2_vp9_frame_symbol_counts - pointers to arrays of symbol counts
  *
  * @partition: partition counts.
Signature · 1 line
2.43.0.429.g432eaa2c6b-goog
#43 lore raw

Re: [PATCH 17/17] linux: v4l2-vp9.h: Fix kerneldoc

Hi Ricardo,

Quoted 7 lines · Ricardo Ribalda

Kerneldoc cannot understand arrays defined like
v4l2_frame_symbol_counts.

Adding an asterisk to the name does do the trick.

Disable the kerneldoc notation for now, it is already ignored:
https://docs.kernel.org/search.html?q=v4l2_vp9_frame_symbol_counts

Wouldn't it be nicer to fix kerneldoc instead? It might not be difficult at all.

Feel free to, but I can also give it a try.

Signature · 3 lines
Regards,

Sakari Ailus
#44 lore raw

Re: [PATCH 17/17] linux: v4l2-vp9.h: Fix kerneldoc

Quoted 8 lines · Sakari Ailus

Hi Ricardo,

Quoted 5 lines · Ricardo Ribalda

Kerneldoc cannot understand arrays defined like
v4l2_frame_symbol_counts.

Adding an asterisk to the name does do the trick.

Quoted 8 lines
Quoted 2 lines

Disable the kerneldoc notation for now, it is already ignored:
https://docs.kernel.org/search.html?q=v4l2_vp9_frame_symbol_counts

Wouldn't it be nicer to fix kerneldoc instead? It might not be difficult at all.

Feel free to, but I can also give it a try.

It would be nice to have this fixed in kerneldoc itself. I'm holding this patch back for two weeks to see if someone wants to work on kerneldoc.

If not, then I'll take this anyway to fix the noise in our build.

Note that while this header is indeed ignored in the documentation, that is really more a bug and it would be nice to actually include this header somewhere in our documentation. So fixing these kerneldoc warnings one way or another is something that we should do.

Regards,

Hans

reviewer
#45 lore raw

Re: [PATCH 17/17] linux: v4l2-vp9.h: Fix kerneldoc

Quoted 21 lines · Hans Verkuil
Quoted 8 lines · Sakari Ailus

Hi Ricardo,

Quoted 5 lines · Ricardo Ribalda

Kerneldoc cannot understand arrays defined like
v4l2_frame_symbol_counts.

Adding an asterisk to the name does do the trick.

Quoted 8 lines
Quoted 2 lines

Disable the kerneldoc notation for now, it is already ignored:
https://docs.kernel.org/search.html?q=v4l2_vp9_frame_symbol_counts

Wouldn't it be nicer to fix kerneldoc instead? It might not be difficult at all.

Feel free to, but I can also give it a try.

It would be nice to have this fixed in kerneldoc itself. I'm holding this patch back for two weeks to see if someone wants to work on kerneldoc.

Quoted 7 lines

If not, then I'll take this anyway to fix the noise in our build.

Note that while this header is indeed ignored in the documentation, that is really more a bug and it would be nice to actually include this header somewhere in our documentation. So fixing these kerneldoc warnings one way or another is something that we should do.

It's just waiting for Jon to apply it: (from Sakari)

https://lore.kernel.org/all/[email protected]/

Thanks.

Signature · 1 line
#Randy
#46 lore raw

Re: [PATCH 17/17] linux: v4l2-vp9.h: Fix kerneldoc

Quoted 32 lines · Randy Dunlap
Quoted 21 lines · Hans Verkuil
Quoted 8 lines · Sakari Ailus

Hi Ricardo,

Quoted 5 lines · Ricardo Ribalda

Kerneldoc cannot understand arrays defined like
v4l2_frame_symbol_counts.

Adding an asterisk to the name does do the trick.

Quoted 8 lines
Quoted 2 lines

Disable the kerneldoc notation for now, it is already ignored:
https://docs.kernel.org/search.html?q=v4l2_vp9_frame_symbol_counts

Wouldn't it be nicer to fix kerneldoc instead? It might not be difficult at all.

Feel free to, but I can also give it a try.

It would be nice to have this fixed in kerneldoc itself. I'm holding this patch back for two weeks to see if someone wants to work on kerneldoc.

Quoted 7 lines

If not, then I'll take this anyway to fix the noise in our build.

Note that while this header is indeed ignored in the documentation, that is really more a bug and it would be nice to actually include this header somewhere in our documentation. So fixing these kerneldoc warnings one way or another is something that we should do.

Quoted 3 lines

It's just waiting for Jon to apply it: (from Sakari)

https://lore.kernel.org/all/[email protected]/

Ah, that patch was CCed to me but not to linux-media, and I only searched linux-media for it so I missed it. Good news that this is fixed in the right place.

I marked this 17/17 patch as Obsoleted in patchwork.

Regards,

Hans

maintainer
#47 lore raw

Re: [PATCH 17/17] linux: v4l2-vp9.h: Fix kerneldoc

Hi Hans,

Quoted 33 lines · Hans Verkuil
Quoted 32 lines · Randy Dunlap
Quoted 28 lines · Hans Verkuil
Quoted 8 lines · Sakari Ailus

Hi Ricardo,

Quoted 5 lines · Ricardo Ribalda

Kerneldoc cannot understand arrays defined like
v4l2_frame_symbol_counts.

Adding an asterisk to the name does do the trick.

Quoted 8 lines
Quoted 2 lines

Disable the kerneldoc notation for now, it is already ignored:
https://docs.kernel.org/search.html?q=v4l2_vp9_frame_symbol_counts

Wouldn't it be nicer to fix kerneldoc instead? It might not be difficult at all.

Feel free to, but I can also give it a try.

It would be nice to have this fixed in kerneldoc itself. I'm holding this patch back for two weeks to see if someone wants to work on kerneldoc.

If not, then I'll take this anyway to fix the noise in our build.

Note that while this header is indeed ignored in the documentation, that is really more a bug and it would be nice to actually include this header somewhere in our documentation. So fixing these kerneldoc warnings one way or another is something that we should do.

Quoted 6 lines
Quoted 3 lines

It's just waiting for Jon to apply it: (from Sakari)

https://lore.kernel.org/all/[email protected]/

Ah, that patch was CCed to me but not to linux-media, and I only searched linux-media for it so I missed it. Good news that this is fixed in the right place.

My bad, somehow I missed linux-media from the distribution. :-(

Quoted 2 lines

I marked this 17/17 patch as Obsoleted in patchwork.

Thank you!

Signature · 3 lines
Regards,

Sakari Ailus
maintainer
#48 lore raw

RFC 1/1 kernel-doc: Support arrays of pointers struct fields

In reply to Ricardo Ribalda

In a rather unusual arrangement in include/media/v4l2-vp9.h struct v4l2_vp9_frame_symbol_counts has fields that are arrays of pointers, not a pointer to an array, which is what's usually done.

Add support for such arrays of pointers to kernel-doc.

---
Hi Ricardo,

I tried to ram it together with processing the rest but it seemed to complicate processing the usual fields.

 scripts/kernel-doc | 9 +++++++++
 1 file changed, 9 insertions(+)
scripts/kernel-doc +9 -0
index e8aefd258a29..728b1ffc0478 100755
@@ -1509,6 +1509,15 @@ sub create_parameterlist($$$$) {
 	    $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
 	    save_struct_actual($param);
 	    push_parameter($param, $type, $arg, $file, $declaration_name);
+	} elsif ($arg =~ m/\(.+\)\s*\[/) {
+	    # array-of-pointers
+	    $arg =~ tr/#/,/;
+	    $arg =~ m/[^\(]+\(\s*\*\s*([\w\[\]\.]*?)\s*(\s*\[\s*[\w]+\s*\]\s*)*\)/;
+	    $param = $1;
+	    $type = $arg;
+	    $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
+	    save_struct_actual($param);
+	    push_parameter($param, $type, $arg, $file, $declaration_name);
 	} elsif ($arg) {
 	    $arg =~ s/\s*:\s*/:/g;
 	    $arg =~ s/\s*\[/\[/g;
Signature · 1 line
2.39.2
reviewer
#49 lore raw

Re: [RFC 1/1] kernel-doc: Support arrays of pointers struct fields

Hi Sakari,

Quoted 4 lines · Sakari Ailus

In a rather unusual arrangement in include/media/v4l2-vp9.h struct v4l2_vp9_frame_symbol_counts has fields that are arrays of pointers, not a pointer to an array, which is what's usually done.

Yet another kernel-doc bug. I have a list of 5 or 6 or 8 bugs that are similar to this one, but I didn't have this one.

Quoted 3 lines

Add support for such arrays of pointers to kernel-doc.

Did this work for you?
I still see the same warnings as before this patch is applied.

Quoted 19 lines

---
Hi Ricardo,

I tried to ram it together with processing the rest but it seemed to complicate processing the usual fields.

 scripts/kernel-doc | 9 +++++++++
 1 file changed, 9 insertions(+)
scripts/kernel-doc +2 -0
index e8aefd258a29..728b1ffc0478 100755
@@ -1509,6 +1509,15 @@ sub create_parameterlist($$$$) {
 	    $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
 	    save_struct_actual($param);
 	    push_parameter($param, $type, $arg, $file, $declaration_name);
+	} elsif ($arg =~ m/\(.+\)\s*\[/) {
+	    # array-of-pointers

scripts/kernel-doc sub create_parameterlist($$$$) { · line 1523

Quoted 10 lines
scripts/kernel-doc +7 -0
+	    $arg =~ tr/#/,/;
+	    $arg =~ m/[^\(]+\(\s*\*\s*([\w\[\]\.]*?)\s*(\s*\[\s*[\w]+\s*\]\s*)*\)/;
+	    $param = $1;
+	    $type = $arg;
+	    $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
+	    save_struct_actual($param);
+	    push_parameter($param, $type, $arg, $file, $declaration_name);
 	} elsif ($arg) {
 	    $arg =~ s/\s*:\s*/:/g;
 	    $arg =~ s/\s*\[/\[/g;

Thanks.

Signature · 1 line
#Randy
maintainer
#50 lore raw

Re: [RFC 1/1] kernel-doc: Support arrays of pointers struct fields

Hi Randy,

Quoted 10 lines · Randy Dunlap

Hi Sakari,

Quoted 4 lines · Sakari Ailus

In a rather unusual arrangement in include/media/v4l2-vp9.h struct v4l2_vp9_frame_symbol_counts has fields that are arrays of pointers, not a pointer to an array, which is what's usually done.

Yet another kernel-doc bug. I have a list of 5 or 6 or 8 bugs that are similar to this one, but I didn't have this one.

:-)

Regular expressions are not best for parsing C. It seems to be doable in practice but imperfect at the same time.

Quoted 9 lines
Quoted 5 lines

Add support for such arrays of pointers to kernel-doc.

Did this work for you?
I still see the same warnings as before this patch is applied.

Hmm. How did you test this? I did:

	$ scripts/kernel-doc include/media/v4l2-vp9.h > /dev/null

Without this patch I do get a bunch of errors, with this patch there's no output. The produced kernel-doc seemed to be fine, too (with the redirection removed).

Quoted 34 lines
Quoted 21 lines

---
Hi Ricardo,

I tried to ram it together with processing the rest but it seemed to complicate processing the usual fields.

 scripts/kernel-doc | 9 +++++++++
 1 file changed, 9 insertions(+)
scripts/kernel-doc +2 -0
index e8aefd258a29..728b1ffc0478 100755
@@ -1509,6 +1509,15 @@ sub create_parameterlist($$$$) {
 	    $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
 	    save_struct_actual($param);
 	    push_parameter($param, $type, $arg, $file, $declaration_name);
+	} elsif ($arg =~ m/\(.+\)\s*\[/) {
+	    # array-of-pointers

scripts/kernel-doc sub create_parameterlist($$$$) { · line 1523

Quoted 10 lines
scripts/kernel-doc +7 -0
+	    $arg =~ tr/#/,/;
+	    $arg =~ m/[^\(]+\(\s*\*\s*([\w\[\]\.]*?)\s*(\s*\[\s*[\w]+\s*\]\s*)*\)/;
+	    $param = $1;
+	    $type = $arg;
+	    $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
+	    save_struct_actual($param);
+	    push_parameter($param, $type, $arg, $file, $declaration_name);
 	} elsif ($arg) {
 	    $arg =~ s/\s*:\s*/:/g;
 	    $arg =~ s/\s*\[/\[/g;

Thanks.

Signature · 3 lines
Regards,

Sakari Ailus
reviewer Acked-by Tested-by
#51 lore raw

Re: [RFC 1/1] kernel-doc: Support arrays of pointers struct fields

Quoted 29 lines · Sakari Ailus

Hi Randy,

Quoted 10 lines · Randy Dunlap

Hi Sakari,

Quoted 4 lines · Sakari Ailus

In a rather unusual arrangement in include/media/v4l2-vp9.h struct v4l2_vp9_frame_symbol_counts has fields that are arrays of pointers, not a pointer to an array, which is what's usually done.

Yet another kernel-doc bug. I have a list of 5 or 6 or 8 bugs that are similar to this one, but I didn't have this one.

:-)

Regular expressions are not best for parsing C. It seems to be doable in practice but imperfect at the same time.

Quoted 9 lines
Quoted 5 lines

Add support for such arrays of pointers to kernel-doc.

Did this work for you?
I still see the same warnings as before this patch is applied.

Quoted 8 lines

Hmm. How did you test this? I did:

	$ scripts/kernel-doc include/media/v4l2-vp9.h > /dev/null

Without this patch I do get a bunch of errors, with this patch there's no output. The produced kernel-doc seemed to be fine, too (with the redirection removed).

I apologize. I wasn't being careful, just rushing too much. It works well. Thanks.

Quoted 35 lines
Quoted 34 lines
Quoted 21 lines

---
Hi Ricardo,

I tried to ram it together with processing the rest but it seemed to complicate processing the usual fields.

 scripts/kernel-doc | 9 +++++++++
 1 file changed, 9 insertions(+)
scripts/kernel-doc +2 -0
index e8aefd258a29..728b1ffc0478 100755
@@ -1509,6 +1509,15 @@ sub create_parameterlist($$$$) {
 	    $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
 	    save_struct_actual($param);
 	    push_parameter($param, $type, $arg, $file, $declaration_name);
+	} elsif ($arg =~ m/\(.+\)\s*\[/) {
+	    # array-of-pointers

scripts/kernel-doc sub create_parameterlist($$$$) { · line 1523

Quoted 10 lines
scripts/kernel-doc +7 -0
+	    $arg =~ tr/#/,/;
+	    $arg =~ m/[^\(]+\(\s*\*\s*([\w\[\]\.]*?)\s*(\s*\[\s*[\w]+\s*\]\s*)*\)/;
+	    $param = $1;
+	    $type = $arg;
+	    $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
+	    save_struct_actual($param);
+	    push_parameter($param, $type, $arg, $file, $declaration_name);
 	} elsif ($arg) {
 	    $arg =~ s/\s*:\s*/:/g;
 	    $arg =~ s/\s*\[/\[/g;

Thanks.

Signature · 1 line
#Randy
author Tested-by on v1 1/1
#52 lore raw

Re: [RFC 1/1] kernel-doc: Support arrays of pointers struct fields

In reply to Sakari Ailus

Hi Sakari

Thanks a lot for the patch :)

Quoted 8 lines · Sakari Ailus

In a rather unusual arrangement in include/media/v4l2-vp9.h struct v4l2_vp9_frame_symbol_counts has fields that are arrays of pointers, not a pointer to an array, which is what's usually done.

Add support for such arrays of pointers to kernel-doc.

Quoted 32 lines

---
Hi Ricardo,

I tried to ram it together with processing the rest but it seemed to complicate processing the usual fields.

 scripts/kernel-doc | 9 +++++++++
 1 file changed, 9 insertions(+)
scripts/kernel-doc +9 -1
index e8aefd258a29..728b1ffc0478 100755
@@ -1509,6 +1509,15 @@ sub create_parameterlist($$$$) {
            $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
            save_struct_actual($param);
            push_parameter($param, $type, $arg, $file, $declaration_name);
+       } elsif ($arg =~ m/\(.+\)\s*\[/) {
+           # array-of-pointers
+           $arg =~ tr/#/,/;
+           $arg =~ m/[^\(]+\(\s*\*\s*([\w\[\]\.]*?)\s*(\s*\[\s*[\w]+\s*\]\s*)*\)/;
+           $param = $1;
+           $type = $arg;
+           $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
+           save_struct_actual($param);
+           push_parameter($param, $type, $arg, $file, $declaration_name);
        } elsif ($arg) {
            $arg =~ s/\s*:\s*/:/g;
            $arg =~ s/\s*\[/\[/g;
--

2.39.2

Signature · 1 line
Ricardo Ribalda
maintainer
#53 lore raw

Re: [RFC 1/1] kernel-doc: Support arrays of pointers struct fields

In reply to Sakari Ailus
Quoted 7 lines · Sakari Ailus

In a rather unusual arrangement in include/media/v4l2-vp9.h struct v4l2_vp9_frame_symbol_counts has fields that are arrays of pointers, not a pointer to an array, which is what's usually done.

Add support for such arrays of pointers to kernel-doc.

Quoted 8 lines

---
Hi Ricardo,

I tried to ram it together with processing the rest but it seemed to complicate processing the usual fields.

 scripts/kernel-doc | 9 +++++++++
 1 file changed, 9 insertions(+)

So I went to apply this...but b4 then pulls in a whole series of patches, none of which were sent to me. Since this says "1/1", I was not expecting that... I've unapplied it; can I get something that isn't buried in a bunch of other work?

Thanks,

jon

#54 lore raw

Re: [RFC 1/1] kernel-doc: Support arrays of pointers struct fields

Hi Jon,

Quoted 16 lines · Jonathan Corbet
Quoted 13 lines · Sakari Ailus

In a rather unusual arrangement in include/media/v4l2-vp9.h struct v4l2_vp9_frame_symbol_counts has fields that are arrays of pointers, not a pointer to an array, which is what's usually done.

Add support for such arrays of pointers to kernel-doc.

---
Hi Ricardo,

I tried to ram it together with processing the rest but it seemed to complicate processing the usual fields.

Quoted 8 lines
Quoted 2 lines
 scripts/kernel-doc | 9 +++++++++
 1 file changed, 9 insertions(+)

So I went to apply this...but b4 then pulls in a whole series of patches, none of which were sent to me. Since this says "1/1", I was not expecting that... I've unapplied it; can I get something that isn't buried in a bunch of other work?

b4 shazam -P _ [email protected]

worked with me, including the trailers... Do you prefer to try that or to wait for Sakari to resend it?

Regards!

Quoted 3 lines

Thanks,

jon

Signature · 1 line
Ricardo Ribalda
maintainer
#55 lore raw

Re: [RFC 1/1] kernel-doc: Support arrays of pointers struct fields

Quoted 28 lines · Ricardo Ribalda

Hi Jon,

Quoted 16 lines · Jonathan Corbet
Quoted 13 lines · Sakari Ailus

In a rather unusual arrangement in include/media/v4l2-vp9.h struct v4l2_vp9_frame_symbol_counts has fields that are arrays of pointers, not a pointer to an array, which is what's usually done.

Add support for such arrays of pointers to kernel-doc.

---
Hi Ricardo,

I tried to ram it together with processing the rest but it seemed to complicate processing the usual fields.

Quoted 8 lines
Quoted 2 lines
 scripts/kernel-doc | 9 +++++++++
 1 file changed, 9 insertions(+)

So I went to apply this...but b4 then pulls in a whole series of patches, none of which were sent to me. Since this says "1/1", I was not expecting that... I've unapplied it; can I get something that isn't buried in a bunch of other work?

Quoted 4 lines

b4 shazam -P _ [email protected]

worked with me, including the trailers... Do you prefer to try that or to wait for Sakari to resend it?

Yes, I can work out ways too - going back to the dark pre-b4 days if nothing else :) But I'd rather not blindly apply a patch that clearly seems to be a part of a larger set that I've not seen. Getting a standalone version would be preferable.

Thanks,

jon