diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-07 22:12:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 12:18:51 -0200 |
| commit | 687b4209c83e9b0633f794949c0bc6fb1401ccba (patch) | |
| tree | 09e7b14b1f4a56d566f5ac85f564f8e85cd52723 | |
| parent | b50bde4e476dede4a28e9c8fdcd134da2f34ef2e (diff) | |
| download | linux-687b4209c83e9b0633f794949c0bc6fb1401ccba.tar.gz linux-687b4209c83e9b0633f794949c0bc6fb1401ccba.tar.bz2 linux-687b4209c83e9b0633f794949c0bc6fb1401ccba.zip | |
[media] media controller: get rid of entity subtype on Kernel
Don't use anymore the type/subtype entity data/macros
inside the Kernel.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | include/media/media-entity.h | 10 | ||||
| -rw-r--r-- | include/uapi/linux/media.h | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/media/media-entity.h b/include/media/media-entity.h index 2596878f4b9f..5171e3c1c71a 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -185,16 +185,6 @@ struct media_intf_devnode { u32 minor; }; -static inline u32 media_entity_type(struct media_entity *entity) -{ - return entity->type & MEDIA_ENT_TYPE_MASK; -} - -static inline u32 media_entity_subtype(struct media_entity *entity) -{ - return entity->type & MEDIA_ENT_SUBTYPE_MASK; -} - static inline u32 media_entity_id(struct media_entity *entity) { return entity->graph_obj.id; diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 43109445d126..ecb6ac865905 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -42,8 +42,6 @@ struct media_device_info { #define MEDIA_ENT_ID_FLAG_NEXT (1 << 31) -/* Used values for media_entity_desc::type */ - /* * Initial value to be used when a new entity is created * Drivers should change it to something useful |