diff options
| author |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 10:49:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 11:25:38 -0300 |
| commit | 480884b647c7efecb904a9ed022ee533afb9cb80 (patch) | |
| tree | d656556a59caefe3f07d349b7a9866a37e7fa5a5 /drivers/media/dvb-core/dvbdev.c | |
| parent | [media] dvb-usb: create one media_dev per adapter (diff) | |
| download | linux-dev-480884b647c7efecb904a9ed022ee533afb9cb80.tar.xz linux-dev-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/dvbdev.c')
| -rw-r--r-- | drivers/media/dvb-core/dvbdev.c | 7 |
1 files changed, 4 insertions, 3 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) { |