redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

cx18: Fix compilation when CONFIG_MODULE is disabled

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

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2010-01-28 00:19:00 -02:00
parent 914e8713f2
commit 583d338ddd
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drivers/media/video/cx18/cx18-driver.c
View file

@ -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",