[media] [V2,03/24] pci/ttpci/av7110.c: use IS_ENABLED() macro
replace: #if defined(CONFIG_INPUT_EVDEV) || \ defined(CONFIG_INPUT_EVDEV_MODULE) with: #if IS_ENABLED(CONFIG_INPUT_EVDEV) This change was made for: CONFIG_INPUT_EVDEV, CONFIG_DVB_SP8870 Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
8c31522c64
commit
b168e810b0
|
@ -235,7 +235,7 @@ static void recover_arm(struct av7110 *av7110)
|
|||
|
||||
restart_feeds(av7110);
|
||||
|
||||
#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)
|
||||
#if IS_ENABLED(CONFIG_INPUT_EVDEV)
|
||||
av7110_check_ir_config(av7110, true);
|
||||
#endif
|
||||
}
|
||||
|
@ -268,7 +268,7 @@ static int arm_thread(void *data)
|
|||
if (!av7110->arm_ready)
|
||||
continue;
|
||||
|
||||
#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)
|
||||
#if IS_ENABLED(CONFIG_INPUT_EVDEV)
|
||||
av7110_check_ir_config(av7110, false);
|
||||
#endif
|
||||
|
||||
|
@ -1730,7 +1730,7 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe)
|
|||
|
||||
static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
|
||||
{
|
||||
#if defined(CONFIG_DVB_SP8870) || defined(CONFIG_DVB_SP8870_MODULE)
|
||||
#if IS_ENABLED(CONFIG_DVB_SP8870)
|
||||
struct av7110* av7110 = fe->dvb->priv;
|
||||
|
||||
return request_firmware(fw, name, &av7110->dev->pci->dev);
|
||||
|
@ -2725,7 +2725,7 @@ static int av7110_attach(struct saa7146_dev* dev,
|
|||
|
||||
mutex_init(&av7110->ioctl_mutex);
|
||||
|
||||
#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)
|
||||
#if IS_ENABLED(CONFIG_INPUT_EVDEV)
|
||||
av7110_ir_init(av7110);
|
||||
#endif
|
||||
printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num);
|
||||
|
@ -2768,7 +2768,7 @@ static int av7110_detach(struct saa7146_dev* saa)
|
|||
struct av7110 *av7110 = saa->ext_priv;
|
||||
dprintk(4, "%p\n", av7110);
|
||||
|
||||
#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)
|
||||
#if IS_ENABLED(CONFIG_INPUT_EVDEV)
|
||||
av7110_ir_exit(av7110);
|
||||
#endif
|
||||
if (budgetpatch || av7110->full_ts) {
|
||||
|
|
Loading…
Reference in New Issue