Commit 583d338d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

cx18: Fix compilation when CONFIG_MODULE is disabled 



drivers/media/video/cx18/cx18-driver.c:252: warning: ‘request_modules’ used but never defined

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 914e8713

drivers/media/video/cx18/cx18-driver.c

+21 −24
Original line number Diff line number Diff line
@@ -248,8 +248,27 @@ MODULE_LICENSE("GPL"); 


MODULE_VERSION(CX18_VERSION);



/* Forward Declaration */

static void request_modules(struct cx18 *dev);

#if defined(CONFIG_MODULES) && defined(MODULE)

static void request_module_async(struct work_struct *work)

{

	struct cx18 *dev = container_of(work, struct cx18, request_module_wk);



	/* Make sure cx18-alsa module is loaded */

	request_module("cx18-alsa");



	/* Initialize cx18-alsa for this instance of the cx18 device */

	if (cx18_ext_init != NULL)

		cx18_ext_init(dev);

}



static void request_modules(struct cx18 *dev)

{

	INIT_WORK(&dev->request_module_wk, request_module_async);

	schedule_work(&dev->request_module_wk);

}

#else

#define request_modules(dev)

#endif /* CONFIG_MODULES */



/* Generic utility functions */

int cx18_msleep_timeout(unsigned int msecs, int intr)
@@ -1250,28 +1269,6 @@ static void cx18_remove(struct pci_dev *pci_dev) 
}





#if defined(CONFIG_MODULES) && defined(MODULE)

static void request_module_async(struct work_struct *work)

{

	struct cx18 *dev = container_of(work, struct cx18, request_module_wk);



	/* Make sure cx18-alsa module is loaded */

	request_module("cx18-alsa");



	/* Initialize cx18-alsa for this instance of the cx18 device */

	if (cx18_ext_init != NULL)

		cx18_ext_init(dev);

}



static void request_modules(struct cx18 *dev)

{

	INIT_WORK(&dev->request_module_wk, request_module_async);

	schedule_work(&dev->request_module_wk);

}

#else

#define request_modules(dev)

#endif /* CONFIG_MODULES */



/* define a pci_driver for card detection */

static struct pci_driver cx18_pci_driver = {

      .name =     "cx18",