| Message ID | 20220302220304.1327896-4-djrscally@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Introduce ancillary links | expand |
Hi ! Thanks for the patch ! On 02/03/2022 23:03, Daniel Scally wrote: > Now we have three types of media link, printing the right name during > debug output is slightly more complicated. Add a helper function to > make it easier. > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Daniel Scally <djrscally@gmail.com> Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> > --- > > Changes since v2: > > - None > > Changes since v1: > > - renamed function to link_type_name() (Laurent) > > Changes since the rfc: > > - new patch > > drivers/media/mc/mc-entity.c | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c > index d0563ee4b28b..1a7d0a4fb9e8 100644 > --- a/drivers/media/mc/mc-entity.c > +++ b/drivers/media/mc/mc-entity.c > @@ -44,6 +44,20 @@ static inline const char *intf_type(struct media_interface *intf) > } > }; > > +static inline const char *link_type_name(struct media_link *link) > +{ > + switch (link->flags & MEDIA_LNK_FL_LINK_TYPE) { > + case MEDIA_LNK_FL_DATA_LINK: > + return "data"; > + case MEDIA_LNK_FL_INTERFACE_LINK: > + return "interface"; > + case MEDIA_LNK_FL_ANCILLARY_LINK: > + return "ancillary"; > + default: > + return "unknown"; > + } > +} > + > __must_check int __media_entity_enum_init(struct media_entity_enum *ent_enum, > int idx_max) > { > @@ -89,9 +103,7 @@ static void dev_dbg_obj(const char *event_name, struct media_gobj *gobj) > > dev_dbg(gobj->mdev->dev, > "%s id %u: %s link id %u ==> id %u\n", > - event_name, media_id(gobj), > - media_type(link->gobj0) == MEDIA_GRAPH_PAD ? > - "data" : "interface", > + event_name, media_id(gobj), link_type_name(link), > media_id(link->gobj0), > media_id(link->gobj1)); > break;
diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c index d0563ee4b28b..1a7d0a4fb9e8 100644 --- a/drivers/media/mc/mc-entity.c +++ b/drivers/media/mc/mc-entity.c @@ -44,6 +44,20 @@ static inline const char *intf_type(struct media_interface *intf) } }; +static inline const char *link_type_name(struct media_link *link) +{ + switch (link->flags & MEDIA_LNK_FL_LINK_TYPE) { + case MEDIA_LNK_FL_DATA_LINK: + return "data"; + case MEDIA_LNK_FL_INTERFACE_LINK: + return "interface"; + case MEDIA_LNK_FL_ANCILLARY_LINK: + return "ancillary"; + default: + return "unknown"; + } +} + __must_check int __media_entity_enum_init(struct media_entity_enum *ent_enum, int idx_max) { @@ -89,9 +103,7 @@ static void dev_dbg_obj(const char *event_name, struct media_gobj *gobj) dev_dbg(gobj->mdev->dev, "%s id %u: %s link id %u ==> id %u\n", - event_name, media_id(gobj), - media_type(link->gobj0) == MEDIA_GRAPH_PAD ? - "data" : "interface", + event_name, media_id(gobj), link_type_name(link), media_id(link->gobj0), media_id(link->gobj1)); break;