Merge tag 'v4.0-rc1' into patchwork

[mirror_ubuntu-artful-kernel.git] / drivers / media / dvb-core / dvbdev.h

diff --git a/drivers/media/dvb-core/dvbdev.h b/drivers/media/dvb-core/dvbdev.h
index f96b28e7fc952f210000b39879e91fb29192d292..467c1311bd4ce4cad528407d68dfd035a7f1a821 100644 (file)
--- a/drivers/media/dvb-core/dvbdev.h
+++ b/drivers/media/dvb-core/dvbdev.h
@@ -27,6 +27,7 @@
 #include <linux/poll.h>
 #include <linux/fs.h>
 #include <linux/list.h>
+#include <media/media-device.h>
 
 #define DVB_MAJOR 212
 
@@ -71,6 +72,10 @@ struct dvb_adapter {
        int mfe_shared;                 /* indicates mutually exclusive frontends */
        struct dvb_device *mfe_dvbdev;  /* frontend device in use */
        struct mutex mfe_lock;          /* access lock for thread creation */
+
+#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
+       struct media_device *mdev;
+#endif
 };
 
 
@@ -92,6 +97,15 @@ struct dvb_device {
        /* don't really need those !? -- FIXME: use video_usercopy  */
        int (*kernel_ioctl)(struct file *file, unsigned int cmd, void *arg);
 
+       /* Needed for media controller register/unregister */
+#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
+       const char *name;
+
+       /* Allocated and filled inside dvbdev.c */
+       struct media_entity *entity;
+       struct media_pad *pads;
+#endif
+
        void *priv;
 };
 
@@ -108,6 +122,7 @@ extern int dvb_register_device (struct dvb_adapter *adap,
                                int type);
 
 extern void dvb_unregister_device (struct dvb_device *dvbdev);
+void dvb_create_media_graph(struct media_device *mdev);
 
 extern int dvb_generic_open (struct inode *inode, struct file *file);
 extern int dvb_generic_release (struct inode *inode, struct file *file);