Re: [PATCH] gpiolib: make struct comments into real kernel docs

From: Randy Dunlap
Date: Wed Feb 02 2022 - 11:47:33 EST




On 2/2/22 02:49, Bartosz Golaszewski wrote:
> We have several comments that start with '/**' but don't conform to the
> kernel doc standard. Add proper detailed descriptions for the affected
> definitions and move the docs from the forward declarations to the
> struct definitions where applicable.
>
> Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Signed-off-by: Bartosz Golaszewski <brgl@xxxxxxxx>
> ---
> drivers/gpio/gpiolib.h | 31 +++++++++++++++++++++++++++++++
> include/linux/gpio/consumer.h | 35 ++++++++++++++++-------------------
> 2 files changed, 47 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h
> index 30bc3f80f83e..0025701b7641 100644
> --- a/drivers/gpio/gpiolib.h
> +++ b/drivers/gpio/gpiolib.h
> @@ -72,6 +72,20 @@ struct gpio_device {
> /* gpio suffixes used for ACPI and device tree lookup */
> static __maybe_unused const char * const gpio_suffixes[] = { "gpios", "gpio" };
>
> +/**
> + * struct gpio_array - Opaque descriptor for a structure of GPIO array attributes
> + *
> + * @desc: Array of pointers to the GPIO descriptors
> + * @size: Number of elements in desc
> + * @chip: Parent GPIO chip
> + * @get_mask: Get mask used in fastpath.
> + * @set_mask: Set mask used in fastpath.
> + * @invert_mask: Invert mask used in fastpath.
> + *
> + * This structure is attached to struct gpiod_descs obtained from
> + * gpiod_get_array() and can be passed back to get/set array functions in order
> + * to activate fast processing path if applicable.
> + */

scripts/kernel-doc says:

gpiolib.h:70: warning: Function parameter or member 'notifier' not described in 'gpio_device'
gpiolib.h:70: warning: Function parameter or member 'pin_ranges' not described in 'gpio_device'
2 warnings

> struct gpio_array {
> struct gpio_desc **desc;
> unsigned int size;
> @@ -96,6 +110,23 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,
> extern spinlock_t gpio_lock;
> extern struct list_head gpio_devices;
>
> +
> +/**
> + * struct gpio_desc - Opaque descriptor for a GPIO
> + *
> + * @gdev: Pointer to the parent GPIO device
> + * @flags: Binary descriptor flags
> + * @label: Name of the consumer
> + * @name: Line name
> + * @hog: Pointer to the device node that hogs this line (if any)
> + * @debounce_period_us: Debounce period in microseconds
> + *
> + * These are obtained using gpiod_get() and are preferable to the old
> + * integer-based handles.
> + *
> + * Contrary to integers, a pointer to a gpio_desc is guaranteed to be valid
> + * until the GPIO is released.
> + */
> struct gpio_desc {
> struct gpio_device *gdev;
> unsigned long flags;
> diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
> index 3ad67b4a72be..3ffb054fafbd 100644
> --- a/include/linux/gpio/consumer.h
> +++ b/include/linux/gpio/consumer.h
> @@ -8,27 +8,16 @@
> #include <linux/err.h>
>
> struct device;
> -
> -/**
> - * Opaque descriptor for a GPIO. These are obtained using gpiod_get() and are
> - * preferable to the old integer-based handles.
> - *
> - * Contrary to integers, a pointer to a gpio_desc is guaranteed to be valid
> - * until the GPIO is released.
> - */
> struct gpio_desc;
> -
> -/**
> - * Opaque descriptor for a structure of GPIO array attributes. This structure
> - * is attached to struct gpiod_descs obtained from gpiod_get_array() and can be
> - * passed back to get/set array functions in order to activate fast processing
> - * path if applicable.
> - */
> struct gpio_array;
>
> /**
> - * Struct containing an array of descriptors that can be obtained using
> - * gpiod_get_array().
> + * struct gpio_descs - Struct containing an array of descriptors that can be
> + * obtained using gpiod_get_array()
> + *
> + * @info: Pointer to the opaque gpio_array structure
> + * @ndescs: Number of held descriptors
> + * desc: Array of pointers to GPIO descriptors

consumer.h:26: warning: Function parameter or member 'desc' not described in 'gpio_descs'

as Andy pointed out.
Several of Andy's kernel-doc notation suggestions also look good.


> */
> struct gpio_descs {
> struct gpio_array *info;
> @@ -43,8 +32,16 @@ struct gpio_descs {
> #define GPIOD_FLAGS_BIT_NONEXCLUSIVE BIT(4)
>
> /**
> - * Optional flags that can be passed to one of gpiod_* to configure direction
> - * and output value. These values cannot be OR'd.
> + * enum gpiod_flags - Optional flags that can be passed to one of gpiod_* to
> + * configure direction and output value. These values
> + * cannot be OR'd.
> + *
> + * @GPIOD_ASIS: Don't change the direction
> + * @GPIOD_IN: Set lines to input mode
> + * @GPIOD_OUT_LOW: Set lines to output and drive them low
> + * @GPIOD_OUT_HIGH: Set lines to output and drive them high
> + * @GPIOD_OUT_LOW_OPEN_DRAIN: Set lines to open-drain output and drive them low
> + * @GPIOD_OUT_HIGH_OPEN_DRAIN: Set lines to open-drain output and drive them high
> */
> enum gpiod_flags {
> GPIOD_ASIS = 0,

--
~Randy