diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2015-11-02 21:27:51 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-09-09 10:20:09 -0400 |
commit | 68429f50ab60074e58b98010103fcc5bac4afd54 (patch) | |
tree | 79238fd7fd84b0d20692ef653c735c0fe22dfc57 /drivers/media/media-entity.c | |
parent | dc3cdbc9d4dc22948d7f934789ee71baba55bc82 (diff) |
[media] media: Move media_device link_notify operation to an ops structure
This will allow adding new operations without increasing the
media_device structure size for drivers that don't implement any media
device operation.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/media-entity.c')
-rw-r--r-- | drivers/media/media-entity.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index 9014362e904d..c68239e60487 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c | |||
@@ -808,17 +808,18 @@ int __media_entity_setup_link(struct media_link *link, u32 flags) | |||
808 | 808 | ||
809 | mdev = source->graph_obj.mdev; | 809 | mdev = source->graph_obj.mdev; |
810 | 810 | ||
811 | if (mdev->link_notify) { | 811 | if (mdev->ops && mdev->ops->link_notify) { |
812 | ret = mdev->link_notify(link, flags, | 812 | ret = mdev->ops->link_notify(link, flags, |
813 | MEDIA_DEV_NOTIFY_PRE_LINK_CH); | 813 | MEDIA_DEV_NOTIFY_PRE_LINK_CH); |
814 | if (ret < 0) | 814 | if (ret < 0) |
815 | return ret; | 815 | return ret; |
816 | } | 816 | } |
817 | 817 | ||
818 | ret = __media_entity_setup_link_notify(link, flags); | 818 | ret = __media_entity_setup_link_notify(link, flags); |
819 | 819 | ||
820 | if (mdev->link_notify) | 820 | if (mdev->ops && mdev->ops->link_notify) |
821 | mdev->link_notify(link, flags, MEDIA_DEV_NOTIFY_POST_LINK_CH); | 821 | mdev->ops->link_notify(link, flags, |
822 | MEDIA_DEV_NOTIFY_POST_LINK_CH); | ||
822 | 823 | ||
823 | return ret; | 824 | return ret; |
824 | } | 825 | } |