* [PATCH 1/2] [media] media-device.h: remove extra blank lines
@ 2015-12-11 20:17 Mauro Carvalho Chehab
2015-12-11 20:17 ` [PATCH 2/2] [media] media: move MEDIA_LNK_FL_INTERFACE_LINK logic to link creation Mauro Carvalho Chehab
0 siblings, 1 reply; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2015-12-11 20:17 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List, Mauro Carvalho Chehab
No functional changes.
Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---
include/media/media-device.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/media/media-device.h b/include/media/media-device.h
index 3448ad6320c4..b0594be5d631 100644
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -467,8 +467,6 @@ struct media_device *media_device_find_devres(struct device *dev);
/* Iterate over all links. */
#define media_device_for_each_link(link, mdev) \
list_for_each_entry(link, &(mdev)->links, graph_obj.list)
-
-
#else
static inline int media_device_register(struct media_device *mdev)
{
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] [media] media: move MEDIA_LNK_FL_INTERFACE_LINK logic to link creation
2015-12-11 20:17 [PATCH 1/2] [media] media-device.h: remove extra blank lines Mauro Carvalho Chehab
@ 2015-12-11 20:17 ` Mauro Carvalho Chehab
2015-12-28 0:31 ` Sakari Ailus
0 siblings, 1 reply; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2015-12-11 20:17 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List, Mauro Carvalho Chehab
Instead of flagging an interface link as MEDIA_LNK_FL_INTERFACE_LINK
only when returning to userspace, do it at link creation time.
That would allow using such flag internally, and cleans up a
little bit the code for G_TOPOLOGY ioctl.
Suggested-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---
drivers/media/media-device.c | 3 ---
drivers/media/media-entity.c | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 6406914a9bf5..c12481c753a0 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -361,9 +361,6 @@ static long __media_device_get_topology(struct media_device *mdev,
klink.sink_id = link->gobj1->id;
klink.flags = link->flags;
- if (media_type(link->gobj0) != MEDIA_GRAPH_PAD)
- klink.flags |= MEDIA_LNK_FL_INTERFACE_LINK;
-
if (copy_to_user(ulink, &klink, sizeof(klink)))
ret = -EFAULT;
ulink++;
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 181ca0de6e52..7895e17aeee9 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -526,7 +526,7 @@ media_create_pad_link(struct media_entity *source, u16 source_pad,
link->source = &source->pads[source_pad];
link->sink = &sink->pads[sink_pad];
- link->flags = flags;
+ link->flags = flags && ~MEDIA_LNK_FL_INTERFACE_LINK;
/* Initialize graph object embedded at the new link */
media_gobj_create(source->graph_obj.mdev, MEDIA_GRAPH_LINK,
@@ -756,7 +756,7 @@ struct media_link *media_create_intf_link(struct media_entity *entity,
link->intf = intf;
link->entity = entity;
- link->flags = flags;
+ link->flags = flags | MEDIA_LNK_FL_INTERFACE_LINK;
/* Initialize graph object embedded at the new link */
media_gobj_create(intf->graph_obj.mdev, MEDIA_GRAPH_LINK,
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] [media] media: move MEDIA_LNK_FL_INTERFACE_LINK logic to link creation
2015-12-11 20:17 ` [PATCH 2/2] [media] media: move MEDIA_LNK_FL_INTERFACE_LINK logic to link creation Mauro Carvalho Chehab
@ 2015-12-28 0:31 ` Sakari Ailus
2015-12-28 10:28 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 4+ messages in thread
From: Sakari Ailus @ 2015-12-28 0:31 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: Linux Media Mailing List, Mauro Carvalho Chehab
Hi Mauro,
(Resending, there was an error in handling the cc field.)
On Fri, Dec 11, 2015 at 06:17:53PM -0200, Mauro Carvalho Chehab wrote:
> diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
> index 181ca0de6e52..7895e17aeee9 100644
> --- a/drivers/media/media-entity.c
> +++ b/drivers/media/media-entity.c
> @@ -526,7 +526,7 @@ media_create_pad_link(struct media_entity *source, u16 source_pad,
>
> link->source = &source->pads[source_pad];
> link->sink = &sink->pads[sink_pad];
> - link->flags = flags;
> + link->flags = flags && ~MEDIA_LNK_FL_INTERFACE_LINK;
s/&&/&/
>
> /* Initialize graph object embedded at the new link */
> media_gobj_create(source->graph_obj.mdev, MEDIA_GRAPH_LINK,
> @@ -756,7 +756,7 @@ struct media_link *media_create_intf_link(struct media_entity *entity,
>
> link->intf = intf;
> link->entity = entity;
> - link->flags = flags;
> + link->flags = flags | MEDIA_LNK_FL_INTERFACE_LINK;
>
> /* Initialize graph object embedded at the new link */
> media_gobj_create(intf->graph_obj.mdev, MEDIA_GRAPH_LINK,
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] [media] media: move MEDIA_LNK_FL_INTERFACE_LINK logic to link creation
2015-12-28 0:31 ` Sakari Ailus
@ 2015-12-28 10:28 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2015-12-28 10:28 UTC (permalink / raw)
To: Sakari Ailus; +Cc: Linux Media Mailing List, Mauro Carvalho Chehab
Em Mon, 28 Dec 2015 02:31:32 +0200
Sakari Ailus <sakari.ailus@iki.fi> escreveu:
> Hi Mauro,
>
> (Resending, there was an error in handling the cc field.)
>
> On Fri, Dec 11, 2015 at 06:17:53PM -0200, Mauro Carvalho Chehab wrote:
> > diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
> > index 181ca0de6e52..7895e17aeee9 100644
> > --- a/drivers/media/media-entity.c
> > +++ b/drivers/media/media-entity.c
> > @@ -526,7 +526,7 @@ media_create_pad_link(struct media_entity *source, u16 source_pad,
> >
> > link->source = &source->pads[source_pad];
> > link->sink = &sink->pads[sink_pad];
> > - link->flags = flags;
> > + link->flags = flags && ~MEDIA_LNK_FL_INTERFACE_LINK;
>
> s/&&/&/
Thanks for noticing it. Dan Carpenter sent a patch fixing it.
Regards,
Mauro
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-28 10:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-11 20:17 [PATCH 1/2] [media] media-device.h: remove extra blank lines Mauro Carvalho Chehab
2015-12-11 20:17 ` [PATCH 2/2] [media] media: move MEDIA_LNK_FL_INTERFACE_LINK logic to link creation Mauro Carvalho Chehab
2015-12-28 0:31 ` Sakari Ailus
2015-12-28 10:28 ` Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).