mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-04 06:36:42 +07:00
V4L/DVB (7853): ivtv/cx18: fix compile warnings
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:
parent
feb5bce24e
commit
6a4a79355b
@ -548,6 +548,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef MODULE
|
||||
static u32 cx18_request_module(struct cx18 *cx, u32 hw,
|
||||
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);
|
||||
return hw;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void cx18_load_and_init_modules(struct cx18 *cx)
|
||||
{
|
||||
u32 hw = cx->card->hw_all;
|
||||
int i;
|
||||
|
||||
#ifdef MODULE
|
||||
/* load modules */
|
||||
#ifndef CONFIG_MEDIA_TUNER
|
||||
hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
|
||||
#endif
|
||||
#ifndef CONFIG_VIDEO_CS5345
|
||||
hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* check which i2c devices are actually found */
|
||||
|
@ -853,6 +853,7 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *dev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef MODULE
|
||||
static u32 ivtv_request_module(struct ivtv *itv, u32 hw,
|
||||
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);
|
||||
return hw;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void ivtv_load_and_init_modules(struct ivtv *itv)
|
||||
{
|
||||
u32 hw = itv->card->hw_all;
|
||||
unsigned i;
|
||||
|
||||
#ifdef MODULE
|
||||
/* load modules */
|
||||
#ifndef CONFIG_MEDIA_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
|
||||
#ifndef CONFIG_VIDEO_M52790
|
||||
hw = ivtv_request_module(itv, hw, "m52790", IVTV_HW_M52790);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* check which i2c devices are actually found */
|
||||
|
Loading…
Reference in New Issue
Block a user