aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-19 17:41:10 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-06 06:19:43 -0500
commitb168e810b0e8bef68ccdfb06f741cb4d7142578c (patch)
tree56777d9caa83f63e6c65cd7340197a59a1288046
parent8c31522c64968ae790b0d767d27655c24d913837 (diff)
[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>
-rw-r--r--drivers/media/pci/ttpci/av7110.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c
index 9f281f1db45e..3dc7aa9b6f40 100644
--- a/drivers/media/pci/ttpci/av7110.c
+++ b/drivers/media/pci/ttpci/av7110.c
@@ -235,7 +235,7 @@ static void recover_arm(struct av7110 *av7110)
235 235
236 restart_feeds(av7110); 236 restart_feeds(av7110);
237 237
238#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) 238#if IS_ENABLED(CONFIG_INPUT_EVDEV)
239 av7110_check_ir_config(av7110, true); 239 av7110_check_ir_config(av7110, true);
240#endif 240#endif
241} 241}
@@ -268,7 +268,7 @@ static int arm_thread(void *data)
268 if (!av7110->arm_ready) 268 if (!av7110->arm_ready)
269 continue; 269 continue;
270 270
271#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) 271#if IS_ENABLED(CONFIG_INPUT_EVDEV)
272 av7110_check_ir_config(av7110, false); 272 av7110_check_ir_config(av7110, false);
273#endif 273#endif
274 274
@@ -1730,7 +1730,7 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe)
1730 1730
1731static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name) 1731static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
1732{ 1732{
1733#if defined(CONFIG_DVB_SP8870) || defined(CONFIG_DVB_SP8870_MODULE) 1733#if IS_ENABLED(CONFIG_DVB_SP8870)
1734 struct av7110* av7110 = fe->dvb->priv; 1734 struct av7110* av7110 = fe->dvb->priv;
1735 1735
1736 return request_firmware(fw, name, &av7110->dev->pci->dev); 1736 return request_firmware(fw, name, &av7110->dev->pci->dev);
@@ -2725,7 +2725,7 @@ static int av7110_attach(struct saa7146_dev* dev,
2725 2725
2726 mutex_init(&av7110->ioctl_mutex); 2726 mutex_init(&av7110->ioctl_mutex);
2727 2727
2728#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) 2728#if IS_ENABLED(CONFIG_INPUT_EVDEV)
2729 av7110_ir_init(av7110); 2729 av7110_ir_init(av7110);
2730#endif 2730#endif
2731 printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num); 2731 printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num);
@@ -2768,7 +2768,7 @@ static int av7110_detach(struct saa7146_dev* saa)
2768 struct av7110 *av7110 = saa->ext_priv; 2768 struct av7110 *av7110 = saa->ext_priv;
2769 dprintk(4, "%p\n", av7110); 2769 dprintk(4, "%p\n", av7110);
2770 2770
2771#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) 2771#if IS_ENABLED(CONFIG_INPUT_EVDEV)
2772 av7110_ir_exit(av7110); 2772 av7110_ir_exit(av7110);
2773#endif 2773#endif
2774 if (budgetpatch || av7110->full_ts) { 2774 if (budgetpatch || av7110->full_ts) {