Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

+15 -10
+1 -1
drivers/media/common/siano/smsdvb-main.c
··· 1185 1185 if (smsdvb_debugfs_create(client) < 0) 1186 1186 pr_info("failed to create debugfs node\n"); 1187 1187 1188 - dvb_create_media_graph(coredev->media_dev); 1188 + dvb_create_media_graph(&client->adapter); 1189 1189 1190 1190 pr_info("DVB interface registered.\n"); 1191 1191 return 0;
+4 -3
drivers/media/dvb-core/dvbdev.c
··· 381 381 EXPORT_SYMBOL(dvb_unregister_device); 382 382 383 383 384 - void dvb_create_media_graph(struct media_device *mdev) 385 - { 386 384 #ifdef CONFIG_MEDIA_CONTROLLER_DVB 385 + void dvb_create_media_graph(struct dvb_adapter *adap) 386 + { 387 + struct media_device *mdev = adap->mdev; 387 388 struct media_entity *entity, *tuner = NULL, *fe = NULL; 388 389 struct media_entity *demux = NULL, *dvr = NULL, *ca = NULL; 389 390 ··· 422 421 423 422 if (demux && ca) 424 423 media_entity_create_link(demux, 1, ca, 0, MEDIA_LNK_FL_ENABLED); 425 - #endif 426 424 } 427 425 EXPORT_SYMBOL_GPL(dvb_create_media_graph); 426 + #endif 428 427 429 428 static int dvbdev_check_free_adapter_num(int num) 430 429 {
+6 -1
drivers/media/dvb-core/dvbdev.h
··· 122 122 int type); 123 123 124 124 extern void dvb_unregister_device (struct dvb_device *dvbdev); 125 - void dvb_create_media_graph(struct media_device *mdev); 125 + 126 + #ifdef CONFIG_MEDIA_CONTROLLER_DVB 127 + void dvb_create_media_graph(struct dvb_adapter *adap); 128 + #else 129 + static inline void dvb_create_media_graph(struct dvb_adapter *adap) {} 130 + #endif 126 131 127 132 extern int dvb_generic_open (struct inode *inode, struct file *file); 128 133 extern int dvb_generic_release (struct inode *inode, struct file *file);
+2 -3
drivers/media/usb/cx231xx/cx231xx-dvb.c
··· 540 540 541 541 /* register network adapter */ 542 542 dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); 543 - #ifdef CONFIG_MEDIA_CONTROLLER_DVB 544 - dvb_create_media_graph(dev->media_dev); 545 - #endif 543 + dvb_create_media_graph(&dvb->adapter); 544 + 546 545 return 0; 547 546 548 547 fail_fe_conn:
+1 -1
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
··· 702 702 } 703 703 } 704 704 705 - dvb_create_media_graph(adap->dvb_adap.mdev); 705 + dvb_create_media_graph(&adap->dvb_adap); 706 706 707 707 return 0; 708 708
+1 -1
drivers/media/usb/dvb-usb/dvb-usb-dvb.c
··· 320 320 adap->num_frontends_initialized++; 321 321 } 322 322 323 - dvb_create_media_graph(adap->dvb_adap.mdev); 323 + dvb_create_media_graph(&adap->dvb_adap); 324 324 325 325 return 0; 326 326 }