aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-19 17:41:08 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-06 06:18:36 -0500
commit8268979a429f6c3f6584d7d650af84444336d468 (patch)
treedd86ca8a5eb0aa0d5620fa2ca1feb0d3715c8501 /drivers/media
parentd78a488221059d2bc8627c5175f1d358c57d74a0 (diff)
[media] [V2,01/24] pci/cx88/cx88.h: use IS_ENABLED() macro
replace: #if defined(CONFIG_VIDEO_CX88_DVB) || \ defined(CONFIG_VIDEO_CX88_DVB_MODULE) with: #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) This change was made for: CONFIG_VIDEO_CX88_DVB, CONFIG_VIDEO_CX88_BLACKBIRD, CONFIG_VIDEO_CX88_VP3054 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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/cx88/cx88.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
index ba0dba4a4d22..feff53c0a251 100644
--- a/drivers/media/pci/cx88/cx88.h
+++ b/drivers/media/pci/cx88/cx88.h
@@ -363,7 +363,7 @@ struct cx88_core {
363 unsigned int tuner_formats; 363 unsigned int tuner_formats;
364 364
365 /* config info -- dvb */ 365 /* config info -- dvb */
366#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) 366#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
367 int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage); 367 int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage);
368#endif 368#endif
369 void (*gate_ctrl)(struct cx88_core *core, int open); 369 void (*gate_ctrl)(struct cx88_core *core, int open);
@@ -562,8 +562,7 @@ struct cx8802_dev {
562 562
563 /* for blackbird only */ 563 /* for blackbird only */
564 struct list_head devlist; 564 struct list_head devlist;
565#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \ 565#if IS_ENABLED(CONFIG_VIDEO_CX88_BLACKBIRD)
566 defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE)
567 struct video_device *mpeg_dev; 566 struct video_device *mpeg_dev;
568 u32 mailbox; 567 u32 mailbox;
569 int width; 568 int width;
@@ -574,13 +573,12 @@ struct cx8802_dev {
574 struct cx2341x_handler cxhdl; 573 struct cx2341x_handler cxhdl;
575#endif 574#endif
576 575
577#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) 576#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
578 /* for dvb only */ 577 /* for dvb only */
579 struct videobuf_dvb_frontends frontends; 578 struct videobuf_dvb_frontends frontends;
580#endif 579#endif
581 580
582#if defined(CONFIG_VIDEO_CX88_VP3054) || \ 581#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054)
583 defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
584 /* For VP3045 secondary I2C bus support */ 582 /* For VP3045 secondary I2C bus support */
585 struct vp3054_i2c_state *vp3054; 583 struct vp3054_i2c_state *vp3054;
586#endif 584#endif