Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4987abed authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4267): Remove all instances of request_module("tda9887") 



We should no longer try to load the tda9887 module, because it no longer
exists. The tda9887 driver has been merged into the tuner module.
This patch removes all instances of request_module("tda9887") from
the following video4linux drivers: bttv, cx88, em28xx and saa7134.

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 38a2713a

drivers/media/video/bt8xx/bttv-cards.c

+0 −5
Original line number Diff line number Diff line
@@ -3548,11 +3548,6 @@ void __devinit bttv_init_card2(struct bttv *btv) 
	/* Hybrid DVB card, DOES have a tda9887 */

	if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE)

		tda9887 = 1;

	if((btv->tuner_type == TUNER_PHILIPS_FM1216ME_MK3) ||

	   (btv->tuner_type == TUNER_PHILIPS_FM1236_MK3) ||

	   (btv->tuner_type == TUNER_PHILIPS_FM1256_IH3) ||

	    tda9887)

		request_module("tda9887");

	if (btv->tuner_type != UNSET)

		request_module("tuner");

}

drivers/media/video/cx88/cx88-video.c

+0 −2
Original line number Diff line number Diff line
@@ -1926,8 +1926,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, 
	/* load and configure helper modules */

	if (TUNER_ABSENT != core->tuner_type)

		request_module("tuner");

	if (core->tda9887_conf)

		request_module("tda9887");



	/* register v4l devices */

	dev->video_dev = cx88_vdev_init(core,dev->pci,

drivers/media/video/em28xx/em28xx-video.c

+0 −2
Original line number Diff line number Diff line
@@ -1574,8 +1574,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, 
		request_module("tvp5150");

	if (dev->has_tuner)

		request_module("tuner");

	if (dev->tda9887_conf)

		request_module("tda9887");

#endif

	errCode = em28xx_config(dev);

	if (errCode) {

drivers/media/video/saa7134/saa7134-core.c

+0 −2
Original line number Diff line number Diff line
@@ -942,8 +942,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, 
	/* load i2c helpers */

	if (TUNER_ABSENT != dev->tuner_type)

		request_module("tuner");

	if (dev->tda9887_conf)

		request_module("tda9887");

	if (card_is_empress(dev)) {

		request_module("saa6752hs");

		request_module_depend("saa7134-empress",&need_empress);