Skip to content

Commit

Permalink
cx18: Fix compilation when CONFIG_MODULE is disabled
Browse files Browse the repository at this point in the history
drivers/media/video/cx18/cx18-driver.c:252: warning: ‘request_modules’ used but never defined

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 914e871 commit 583d338
Showing 1 changed file with 21 additions and 24 deletions.
45 changes: 21 additions & 24 deletions drivers/media/video/cx18/cx18-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 583d338

Please sign in to comment.