diff options
author | 2015-03-02 10:49:04 -0300 | |
---|---|---|
committer | 2015-03-02 11:25:38 -0300 | |
commit | 480884b647c7efecb904a9ed022ee533afb9cb80 (patch) | |
tree | d656556a59caefe3f07d349b7a9866a37e7fa5a5 /drivers/media/dvb-core | |
parent | [media] dvb-usb: create one media_dev per adapter (diff) | |
download | linux-480884b647c7efecb904a9ed022ee533afb9cb80.tar.gz linux-480884b647c7efecb904a9ed022ee533afb9cb80.tar.bz2 linux-480884b647c7efecb904a9ed022ee533afb9cb80.zip |
[media] dvbdev: use adapter arg for dvb_create_media_graph()
Instead of using media_dev argument for dvb_create_media_graph(),
use the adapter.
That allows to create a stub for this function, if compiled
without DVB support, avoiding to add extra if's at the drivers.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/dvb-core')
-rw-r--r-- | drivers/media/dvb-core/dvbdev.c | 7 | ||||
-rw-r--r-- | drivers/media/dvb-core/dvbdev.h | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index 0af9d0c5f889..13bb57f0457f 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -381,9 +381,10 @@ void dvb_unregister_device(struct dvb_device *dvbdev) EXPORT_SYMBOL(dvb_unregister_device); -void dvb_create_media_graph(struct media_device *mdev) -{ #ifdef CONFIG_MEDIA_CONTROLLER_DVB +void dvb_create_media_graph(struct dvb_adapter *adap) +{ + struct media_device *mdev = adap->mdev; struct media_entity *entity, *tuner = NULL, *fe = NULL; struct media_entity *demux = NULL, *dvr = NULL, *ca = NULL; @@ -421,9 +422,9 @@ void dvb_create_media_graph(struct media_device *mdev) if (demux && ca) media_entity_create_link(demux, 1, ca, 0, MEDIA_LNK_FL_ENABLED); -#endif } EXPORT_SYMBOL_GPL(dvb_create_media_graph); +#endif static int dvbdev_check_free_adapter_num(int num) { diff --git a/drivers/media/dvb-core/dvbdev.h b/drivers/media/dvb-core/dvbdev.h index 467c1311bd4c..556c9e9d1d4e 100644 --- a/drivers/media/dvb-core/dvbdev.h +++ b/drivers/media/dvb-core/dvbdev.h @@ -122,7 +122,12 @@ 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); + +#ifdef CONFIG_MEDIA_CONTROLLER_DVB +void dvb_create_media_graph(struct dvb_adapter *adap); +#else +static inline void dvb_create_media_graph(struct dvb_adapter *adap) {} +#endif extern int dvb_generic_open (struct inode *inode, struct file *file); extern int dvb_generic_release (struct inode *inode, struct file *file); |