* [PATCH] media: media-entity.h: Fix documentation for media_create_intf_link
@ 2022-04-08 17:53 Ian Jamison
2022-04-09 19:25 ` Kieran Bingham
0 siblings, 1 reply; 3+ messages in thread
From: Ian Jamison @ 2022-04-08 17:53 UTC (permalink / raw)
To: Sakari Ailus, Laurent Pinchart, Mauro Carvalho Chehab
Cc: Ian Arkver, linux-media, linux-kernel
The documentation comment was inserted between the return type
and the function name. Reunite the lines.
Signed-off-by: Ian Jamison <ian.dev@arkver.com>
Fixes: db7ee32aa185 ("[media] media-device.h: Improve documentation and update it")
---
include/media/media-entity.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 742918962d46..9bc9a55df71e 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -1030,7 +1030,6 @@ __must_check media_devnode_create(struct media_device *mdev,
* removed.
*/
void media_devnode_remove(struct media_intf_devnode *devnode);
-struct media_link *
/**
* media_create_intf_link() - creates a link between an entity and an interface
@@ -1061,6 +1060,7 @@ struct media_link *
* the interface and media_device_register_entity() should be called for the
* interface that will be part of the link.
*/
+struct media_link *
__must_check media_create_intf_link(struct media_entity *entity,
struct media_interface *intf,
u32 flags);
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] media: media-entity.h: Fix documentation for media_create_intf_link
2022-04-08 17:53 [PATCH] media: media-entity.h: Fix documentation for media_create_intf_link Ian Jamison
@ 2022-04-09 19:25 ` Kieran Bingham
2022-04-10 15:10 ` Laurent Pinchart
0 siblings, 1 reply; 3+ messages in thread
From: Kieran Bingham @ 2022-04-09 19:25 UTC (permalink / raw)
To: Ian Jamison, Laurent Pinchart, Mauro Carvalho Chehab,
Sakari Ailus
Cc: Ian Arkver, linux-media, linux-kernel
Quoting Ian Jamison (2022-04-08 18:53:45)
> The documentation comment was inserted between the return type
> and the function name. Reunite the lines.
>
> Signed-off-by: Ian Jamison <ian.dev@arkver.com>
> Fixes: db7ee32aa185 ("[media] media-device.h: Improve documentation and update it")
> ---
> include/media/media-entity.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/media/media-entity.h b/include/media/media-entity.h
> index 742918962d46..9bc9a55df71e 100644
> --- a/include/media/media-entity.h
> +++ b/include/media/media-entity.h
> @@ -1030,7 +1030,6 @@ __must_check media_devnode_create(struct media_device *mdev,
> * removed.
> */
> void media_devnode_remove(struct media_intf_devnode *devnode);
> -struct media_link *
Eeep. I guess that was some sort of merge conflict resolution that
didn't quite get it right sometime.
But definitely a good fix.
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>
> /**
> * media_create_intf_link() - creates a link between an entity and an interface
> @@ -1061,6 +1060,7 @@ struct media_link *
> * the interface and media_device_register_entity() should be called for the
> * interface that will be part of the link.
> */
> +struct media_link *
> __must_check media_create_intf_link(struct media_entity *entity,
> struct media_interface *intf,
> u32 flags);
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] media: media-entity.h: Fix documentation for media_create_intf_link
2022-04-09 19:25 ` Kieran Bingham
@ 2022-04-10 15:10 ` Laurent Pinchart
0 siblings, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2022-04-10 15:10 UTC (permalink / raw)
To: Kieran Bingham
Cc: Ian Jamison, Mauro Carvalho Chehab, Sakari Ailus, Ian Arkver,
linux-media, linux-kernel
On Sat, Apr 09, 2022 at 08:25:40PM +0100, Kieran Bingham wrote:
> Quoting Ian Jamison (2022-04-08 18:53:45)
> > The documentation comment was inserted between the return type
> > and the function name. Reunite the lines.
> >
> > Signed-off-by: Ian Jamison <ian.dev@arkver.com>
> > Fixes: db7ee32aa185 ("[media] media-device.h: Improve documentation and update it")
> > ---
> > include/media/media-entity.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/media/media-entity.h b/include/media/media-entity.h
> > index 742918962d46..9bc9a55df71e 100644
> > --- a/include/media/media-entity.h
> > +++ b/include/media/media-entity.h
> > @@ -1030,7 +1030,6 @@ __must_check media_devnode_create(struct media_device *mdev,
> > * removed.
> > */
> > void media_devnode_remove(struct media_intf_devnode *devnode);
> > -struct media_link *
>
> Eeep. I guess that was some sort of merge conflict resolution that
> didn't quite get it right sometime.
>
> But definitely a good fix.
>
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Indeed.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > /**
> > * media_create_intf_link() - creates a link between an entity and an interface
> > @@ -1061,6 +1060,7 @@ struct media_link *
> > * the interface and media_device_register_entity() should be called for the
> > * interface that will be part of the link.
> > */
> > +struct media_link *
> > __must_check media_create_intf_link(struct media_entity *entity,
> > struct media_interface *intf,
> > u32 flags);
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-10 15:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-08 17:53 [PATCH] media: media-entity.h: Fix documentation for media_create_intf_link Ian Jamison
2022-04-09 19:25 ` Kieran Bingham
2022-04-10 15:10 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox