提交 37b44a0f 编写于 作者: A Antti Palosaari 提交者: Mauro Carvalho Chehab

[media] dvb_usb_v2: use IS_ENABLED() macro

replace:
 #if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
with:
 #if IS_ENABLED(CONFIG_RC_CORE)
Reported-by: NFabio Estevam <festevam@gmail.com>
Signed-off-by: NAntti Palosaari <crope@iki.fi>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 ac1c86c8
...@@ -1156,7 +1156,7 @@ static int af9015_init(struct dvb_usb_device *d) ...@@ -1156,7 +1156,7 @@ static int af9015_init(struct dvb_usb_device *d)
return ret; return ret;
} }
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE) #if IS_ENABLED(CONFIG_RC_CORE)
struct af9015_rc_setup { struct af9015_rc_setup {
unsigned int id; unsigned int id;
char *rc_codes; char *rc_codes;
......
...@@ -1146,7 +1146,7 @@ static int af9035_init(struct dvb_usb_device *d) ...@@ -1146,7 +1146,7 @@ static int af9035_init(struct dvb_usb_device *d)
return ret; return ret;
} }
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE) #if IS_ENABLED(CONFIG_RC_CORE)
static int af9035_rc_query(struct dvb_usb_device *d) static int af9035_rc_query(struct dvb_usb_device *d)
{ {
unsigned int key; unsigned int key;
......
...@@ -1019,7 +1019,7 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap) ...@@ -1019,7 +1019,7 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
return ret; return ret;
} }
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE) #if IS_ENABLED(CONFIG_RC_CORE)
static int anysee_rc_query(struct dvb_usb_device *d) static int anysee_rc_query(struct dvb_usb_device *d)
{ {
u8 buf[] = {CMD_GET_IR_CODE}; u8 buf[] = {CMD_GET_IR_CODE};
......
...@@ -189,7 +189,7 @@ static int az6007_streaming_ctrl(struct dvb_frontend *fe, int onoff) ...@@ -189,7 +189,7 @@ static int az6007_streaming_ctrl(struct dvb_frontend *fe, int onoff)
return az6007_write(d, 0xbc, onoff, 0, NULL, 0); return az6007_write(d, 0xbc, onoff, 0, NULL, 0);
} }
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE) #if IS_ENABLED(CONFIG_RC_CORE)
/* remote control stuff (does not work with my box) */ /* remote control stuff (does not work with my box) */
static int az6007_rc_query(struct dvb_usb_device *d) static int az6007_rc_query(struct dvb_usb_device *d)
{ {
......
...@@ -102,7 +102,7 @@ static int dvb_usbv2_i2c_exit(struct dvb_usb_device *d) ...@@ -102,7 +102,7 @@ static int dvb_usbv2_i2c_exit(struct dvb_usb_device *d)
return 0; return 0;
} }
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE) #if IS_ENABLED(CONFIG_RC_CORE)
static void dvb_usb_read_remote_control(struct work_struct *work) static void dvb_usb_read_remote_control(struct work_struct *work)
{ {
struct dvb_usb_device *d = container_of(work, struct dvb_usb_device *d = container_of(work,
......
...@@ -308,7 +308,7 @@ static struct i2c_algorithm it913x_i2c_algo = { ...@@ -308,7 +308,7 @@ static struct i2c_algorithm it913x_i2c_algo = {
}; };
/* Callbacks for DVB USB */ /* Callbacks for DVB USB */
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE) #if IS_ENABLED(CONFIG_RC_CORE)
static int it913x_rc_query(struct dvb_usb_device *d) static int it913x_rc_query(struct dvb_usb_device *d)
{ {
u8 ibuf[4]; u8 ibuf[4];
......
...@@ -1125,7 +1125,7 @@ static int rtl2832u_power_ctrl(struct dvb_usb_device *d, int onoff) ...@@ -1125,7 +1125,7 @@ static int rtl2832u_power_ctrl(struct dvb_usb_device *d, int onoff)
return ret; return ret;
} }
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE) #if IS_ENABLED(CONFIG_RC_CORE)
static int rtl2831u_rc_query(struct dvb_usb_device *d) static int rtl2831u_rc_query(struct dvb_usb_device *d)
{ {
int ret, i; int ret, i;
...@@ -1212,7 +1212,7 @@ static int rtl2831u_get_rc_config(struct dvb_usb_device *d, ...@@ -1212,7 +1212,7 @@ static int rtl2831u_get_rc_config(struct dvb_usb_device *d,
#define rtl2831u_get_rc_config NULL #define rtl2831u_get_rc_config NULL
#endif #endif
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE) #if IS_ENABLED(CONFIG_RC_CORE)
static int rtl2832u_rc_query(struct dvb_usb_device *d) static int rtl2832u_rc_query(struct dvb_usb_device *d)
{ {
int ret, i; int ret, i;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册