提交 8268979a 编写于 作者: P Peter Senna Tschudin 提交者: Mauro Carvalho Chehab

[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: NMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: NPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 d78a4882
...@@ -363,7 +363,7 @@ struct cx88_core { ...@@ -363,7 +363,7 @@ struct cx88_core {
unsigned int tuner_formats; unsigned int tuner_formats;
/* config info -- dvb */ /* config info -- dvb */
#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage); int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage);
#endif #endif
void (*gate_ctrl)(struct cx88_core *core, int open); void (*gate_ctrl)(struct cx88_core *core, int open);
...@@ -562,8 +562,7 @@ struct cx8802_dev { ...@@ -562,8 +562,7 @@ struct cx8802_dev {
/* for blackbird only */ /* for blackbird only */
struct list_head devlist; struct list_head devlist;
#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \ #if IS_ENABLED(CONFIG_VIDEO_CX88_BLACKBIRD)
defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE)
struct video_device *mpeg_dev; struct video_device *mpeg_dev;
u32 mailbox; u32 mailbox;
int width; int width;
...@@ -574,13 +573,12 @@ struct cx8802_dev { ...@@ -574,13 +573,12 @@ struct cx8802_dev {
struct cx2341x_handler cxhdl; struct cx2341x_handler cxhdl;
#endif #endif
#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
/* for dvb only */ /* for dvb only */
struct videobuf_dvb_frontends frontends; struct videobuf_dvb_frontends frontends;
#endif #endif
#if defined(CONFIG_VIDEO_CX88_VP3054) || \ #if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054)
defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
/* For VP3045 secondary I2C bus support */ /* For VP3045 secondary I2C bus support */
struct vp3054_i2c_state *vp3054; struct vp3054_i2c_state *vp3054;
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册