Hi Sakari,
Thank you for the patch.
On Thu, May 25, 2023 at 12:15:53PM +0300, Sakari Ailus wrote:
> The async match type is a struct field now, rename V4L2_ASYNC_MATCH_*
> macros as V4L2_ASYNC_MATCH_TYPE_* instead.
>
> This patch has been produced by:
>
> git grep -l V4L2_ASYNC_MATCH_ -- drivers/media/ drivers/staging/media/ \
> include/ Documentation/|xargs perl -i -pe \
> 's/V4L2_ASYNC_MATCH_\K/TYPE_/g'
>
> so it must be correct.
I was really hoping to prove you wrong here :-)
> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 22 +++++++++++-----------
> include/media/v4l2-async.h | 16 ++++++++--------
> 2 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> index 7f56648e40c44..93234c316aa6e 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -213,10 +213,10 @@ v4l2_async_find_match(struct v4l2_async_notifier *notifier,
> list_for_each_entry(asd, ¬ifier->waiting, list) {
> /* bus_type has been verified valid before */
> switch (asd->match.type) {
> - case V4L2_ASYNC_MATCH_I2C:
> + case V4L2_ASYNC_MATCH_TYPE_I2C:
> match = match_i2c;
> break;
> - case V4L2_ASYNC_MATCH_FWNODE:
> + case V4L2_ASYNC_MATCH_TYPE_FWNODE:
> match = match_fwnode;
> break;
> default:
> @@ -241,12 +241,12 @@ static bool asd_equal(struct v4l2_async_subdev *asd_x,
> return false;
>
> switch (asd_x->match.type) {
> - case V4L2_ASYNC_MATCH_I2C:
> + case V4L2_ASYNC_MATCH_TYPE_I2C:
> return asd_x->match.i2c.adapter_id ==
> asd_y->match.i2c.adapter_id &&
> asd_x->match.i2c.address ==
> asd_y->match.i2c.address;
> - case V4L2_ASYNC_MATCH_FWNODE:
> + case V4L2_ASYNC_MATCH_TYPE_FWNODE:
> return asd_x->match.fwnode == asd_y->match.fwnode;
> default:
> break;
> @@ -553,8 +553,8 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier,
> struct device *dev = notifier_dev(notifier);
>
> switch (asd->match.type) {
> - case V4L2_ASYNC_MATCH_I2C:
> - case V4L2_ASYNC_MATCH_FWNODE:
> + case V4L2_ASYNC_MATCH_TYPE_I2C:
> + case V4L2_ASYNC_MATCH_TYPE_FWNODE:
> if (v4l2_async_nf_has_async_subdev(notifier, asd, skip_self)) {
> dev_dbg(dev, "v4l2-async: subdev descriptor already listed in a notifier\n");
> return -EEXIST;
> @@ -689,7 +689,7 @@ static void __v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier)
>
> list_for_each_entry_safe(asd, tmp, ¬ifier->asd_list, asd_list) {
> switch (asd->match.type) {
> - case V4L2_ASYNC_MATCH_FWNODE:
> + case V4L2_ASYNC_MATCH_TYPE_FWNODE:
> fwnode_handle_put(asd->match.fwnode);
> break;
> default:
> @@ -743,7 +743,7 @@ __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier,
> if (!asd)
> return ERR_PTR(-ENOMEM);
>
> - asd->match.type = V4L2_ASYNC_MATCH_FWNODE;
> + asd->match.type = V4L2_ASYNC_MATCH_TYPE_FWNODE;
> asd->match.fwnode = fwnode_handle_get(fwnode);
>
> ret = __v4l2_async_nf_add_subdev(notifier, asd);
> @@ -790,7 +790,7 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, int adapter_id,
> if (!asd)
> return ERR_PTR(-ENOMEM);
>
> - asd->match.type = V4L2_ASYNC_MATCH_I2C;
> + asd->match.type = V4L2_ASYNC_MATCH_TYPE_I2C;
> asd->match.i2c.adapter_id = adapter_id;
> asd->match.i2c.address = address;
>
> @@ -902,11 +902,11 @@ static void print_waiting_subdev(struct seq_file *s,
> struct v4l2_async_subdev *asd)
> {
> switch (asd->match.type) {
> - case V4L2_ASYNC_MATCH_I2C:
> + case V4L2_ASYNC_MATCH_TYPE_I2C:
> seq_printf(s, " [i2c] dev=%d-%04x\n", asd->match.i2c.adapter_id,
> asd->match.i2c.address);
> break;
> - case V4L2_ASYNC_MATCH_FWNODE: {
> + case V4L2_ASYNC_MATCH_TYPE_FWNODE: {
> struct fwnode_handle *devnode, *fwnode = asd->match.fwnode;
>
> devnode = fwnode_graph_is_endpoint(fwnode) ?
> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> index d347ef32f4ecb..8d1506a9755c3 100644
> --- a/include/media/v4l2-async.h
> +++ b/include/media/v4l2-async.h
> @@ -22,15 +22,15 @@ struct v4l2_async_notifier;
> * enum v4l2_async_match_type - type of asynchronous subdevice logic to be used
> * in order to identify a match
> *
> - * @V4L2_ASYNC_MATCH_I2C: Match will check for I2C adapter ID and address
> - * @V4L2_ASYNC_MATCH_FWNODE: Match will use firmware node
> + * @V4L2_ASYNC_MATCH_TYPE_I2C: Match will check for I2C adapter ID and address
> + * @V4L2_ASYNC_MATCH_TYPE_FWNODE: Match will use firmware node
> *
> * This enum is used by the asynchronous sub-device logic to define the
> * algorithm that will be used to match an asynchronous device.
> */
> enum v4l2_async_match_type {
> - V4L2_ASYNC_MATCH_I2C,
> - V4L2_ASYNC_MATCH_FWNODE,
> + V4L2_ASYNC_MATCH_TYPE_I2C,
> + V4L2_ASYNC_MATCH_TYPE_FWNODE,
> };
>
> /**
> @@ -38,17 +38,17 @@ enum v4l2_async_match_type {
> *
> * @type: type of match that will be used
> * @fwnode: pointer to &struct fwnode_handle to be matched.
> - * Used if @match_type is %V4L2_ASYNC_MATCH_FWNODE.
> + * Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_FWNODE.
> * @i2c: embedded struct with I2C parameters to be matched.
> * Both @match.i2c.adapter_id and @match.i2c.address
> * should be matched.
> - * Used if @match_type is %V4L2_ASYNC_MATCH_I2C.
> + * Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_I2C.
> * @i2c.adapter_id:
> * I2C adapter ID to be matched.
> - * Used if @match_type is %V4L2_ASYNC_MATCH_I2C.
> + * Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_I2C.
> * @i2c.address:
> * I2C address to be matched.
> - * Used if @match_type is %V4L2_ASYNC_MATCH_I2C.
> + * Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_I2C.
> */
> struct v4l2_async_match_desc {
> enum v4l2_async_match_type type;
--
Regards,
Laurent Pinchart
