iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (7853): ivtv/cx18: fix compile warnings

Browse Source 
Fix compile warnings if MODULE is not defined.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2008-05-01 09:34:54 -03:00 committed by Mauro Carvalho Chehab
parent feb5bce24e
commit 6a4a79355b
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/cx18/cx18-driver.c
View File

@ -548,6 +548,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
return 0; return 0;
} }
#ifdef MODULE
static u32 cx18_request_module(struct cx18 *cx, u32 hw, static u32 cx18_request_module(struct cx18 *cx, u32 hw,
const char *name, u32 id) const char *name, u32 id)
{ {
@ -560,18 +561,21 @@ static u32 cx18_request_module(struct cx18 *cx, u32 hw,
CX18_DEBUG_INFO("Loaded module %s\n", name); CX18_DEBUG_INFO("Loaded module %s\n", name);
return hw; return hw;
} }
#endif
static void cx18_load_and_init_modules(struct cx18 *cx) static void cx18_load_and_init_modules(struct cx18 *cx)
{ {
u32 hw = cx->card->hw_all; u32 hw = cx->card->hw_all;
int i; int i;
#ifdef MODULE
/* load modules */ /* load modules */
#ifndef CONFIG_MEDIA_TUNER #ifndef CONFIG_MEDIA_TUNER
hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER); hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
#endif #endif
#ifndef CONFIG_VIDEO_CS5345 #ifndef CONFIG_VIDEO_CS5345
hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345); hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345);
#endif
#endif #endif
/* check which i2c devices are actually found */ /* check which i2c devices are actually found */

4
drivers/media/video/ivtv/ivtv-driver.c
View File

@ -853,6 +853,7 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *dev,
return 0; return 0;
} }
#ifdef MODULE
static u32 ivtv_request_module(struct ivtv *itv, u32 hw, static u32 ivtv_request_module(struct ivtv *itv, u32 hw,
const char *name, u32 id) const char *name, u32 id)
{ {
@ -865,12 +866,14 @@ static u32 ivtv_request_module(struct ivtv *itv, u32 hw,
IVTV_DEBUG_INFO("Loaded module %s\n", name); IVTV_DEBUG_INFO("Loaded module %s\n", name);
return hw; return hw;
} }
#endif
static void ivtv_load_and_init_modules(struct ivtv *itv) static void ivtv_load_and_init_modules(struct ivtv *itv)
{ {
u32 hw = itv->card->hw_all; u32 hw = itv->card->hw_all;
unsigned i; unsigned i;
#ifdef MODULE
/* load modules */ /* load modules */
#ifndef CONFIG_MEDIA_TUNER #ifndef CONFIG_MEDIA_TUNER
hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER); hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER);
@ -910,6 +913,7 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
#endif #endif
#ifndef CONFIG_VIDEO_M52790 #ifndef CONFIG_VIDEO_M52790
hw = ivtv_request_module(itv, hw, "m52790", IVTV_HW_M52790); hw = ivtv_request_module(itv, hw, "m52790", IVTV_HW_M52790);
#endif
#endif #endif
/* check which i2c devices are actually found */ /* check which i2c devices are actually found */