openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2013-01-04 15:21:26 -03:00 committed by Mauro Carvalho Chehab
parent ac1c86c857
commit 37b44a0f04
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/usb/dvb-usb-v2/af9015.c
View File

@ -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;

2
drivers/media/usb/dvb-usb-v2/af9035.c
View File

@ -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;

2
drivers/media/usb/dvb-usb-v2/anysee.c
View File

@ -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};

2
drivers/media/usb/dvb-usb-v2/az6007.c
View File

@ -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)
{ {

2
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
View File

@ -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,

2
drivers/media/usb/dvb-usb-v2/it913x.c
View File

@ -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];

4
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
View File

@ -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,
#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;