[PATCH 16/18] v4l2-subdev: use MEDIA_ENT_T_UNKNOWN for new subdevs
From: Mauro Carvalho Chehab <hidden>
Date: 2015-05-08 01:12:54
Also in:
linux-media
Subsystem:
media controller framework, media input infrastructure (v4l/dvb), the rest · Maintainers:
Sakari Ailus, Laurent Pinchart, Mauro Carvalho Chehab, Linus Torvalds
Instead of abusing MEDIA_ENT_T_V4L2_SUBDEV, initialize new subdev entities as MEDIA_ENT_T_UNKNOWN. Signed-off-by: Mauro Carvalho Chehab <redacted>
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 66c6d9fd2033..0233d30b4922 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c@@ -584,7 +584,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops) sd->host_priv = NULL; #if defined(CONFIG_MEDIA_CONTROLLER) sd->entity.name = sd->name; - sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV; + sd->entity.type = MEDIA_ENT_T_UNKNOWN; #endif } EXPORT_SYMBOL(v4l2_subdev_init);
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 8d47b70b7ea8..663eb2c6019d 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h@@ -44,6 +44,12 @@ struct media_device_info { /* Used values for media_entity_desc::type */ +/* + * Initial value when an entity is created + * Drivers should change it to something useful + */ +#define MEDIA_ENT_T_UNKNOWN 0 + /* Audio/video streaming bridges */ #define MEDIA_ENT_T_AV_DMA (((1 << 16)) + 1)
--
2.1.0