8 files changed, 60 insertions, 60 deletions

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index bc2a6e464cea..8671ca362c81 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1344,11 +1344,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .identify_state = af9015_identify_state,
 
                 .rc.core = {
-                        .protocol         = IR_TYPE_NEC,
+                        .protocol         = RC_TYPE_NEC,
                         .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
                         .rc_interval      = AF9015_RC_INTERVAL,
-                        .allowed_protos   = IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
@@ -1472,11 +1472,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .identify_state = af9015_identify_state,
 
                 .rc.core = {
-                        .protocol         = IR_TYPE_NEC,
+                        .protocol         = RC_TYPE_NEC,
                         .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
                         .rc_interval      = AF9015_RC_INTERVAL,
-                        .allowed_protos   = IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
@@ -1584,11 +1584,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .identify_state = af9015_identify_state,
 
                 .rc.core = {
-                        .protocol         = IR_TYPE_NEC,
+                        .protocol         = RC_TYPE_NEC,
                         .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
                         .rc_interval      = AF9015_RC_INTERVAL,
-                        .allowed_protos   = IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index 5e12488f3c76..6b402e943539 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -476,7 +476,7 @@ static struct dvb_usb_device_properties anysee_properties = {
 
         .rc.core = {
                 .rc_codes         = RC_MAP_ANYSEE,
-                .protocol         = IR_TYPE_OTHER,
+                .protocol         = RC_TYPE_OTHER,
                 .module_name      = "anysee",
                 .rc_query         = anysee_rc_query,
                 .rc_interval      = 250,  /* windows driver uses 500ms */
diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h
index 1e7d780332b5..3537d65c04bc 100644
--- a/drivers/media/dvb/dvb-usb/dib0700.h
+++ b/drivers/media/dvb/dvb-usb/dib0700.h
@@ -60,7 +60,7 @@ extern int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);
 extern struct i2c_algorithm dib0700_i2c_algo;
 extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
                         struct dvb_usb_device_description **desc, int *cold);
-extern int dib0700_change_protocol(struct rc_dev *dev, u64 ir_type);
+extern int dib0700_change_protocol(struct rc_dev *dev, u64 rc_type);
 
 extern int dib0700_device_count;
 extern int dvb_usb_dib0700_ir_proto;
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
index 1dd119e7b676..8ca48f76dfa9 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -471,7 +471,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
         return dib0700_ctrl_wr(adap->dev, b, 4);
 }
 
-int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
+int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
 {
         struct dvb_usb_device *d = rc->priv;
         struct dib0700_state *st = d->priv;
@@ -479,11 +479,11 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
         int new_proto, ret;
 
         /* Set the IR mode */
-        if (ir_type == IR_TYPE_RC5)
+        if (rc_type == RC_TYPE_RC5)
                 new_proto = 1;
-        else if (ir_type == IR_TYPE_NEC)
+        else if (rc_type == RC_TYPE_NEC)
                 new_proto = 0;
-        else if (ir_type == IR_TYPE_RC6) {
+        else if (rc_type == RC_TYPE_RC6) {
                 if (st->fw_version < 0x10200)
                         return -EINVAL;
 
@@ -499,7 +499,7 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
                 return ret;
         }
 
-        d->props.rc.core.protocol = ir_type;
+        d->props.rc.core.protocol = rc_type;
 
         return ret;
 }
@@ -562,7 +562,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
                  purb->actual_length);
 
         switch (d->props.rc.core.protocol) {
-        case IR_TYPE_NEC:
+        case RC_TYPE_NEC:
                 toggle = 0;
 
                 /* NEC protocol sends repeat code as 0 0 0 FF */
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 9ac920d0483e..defd83964ce2 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -510,7 +510,7 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
 
         d->last_event = 0;
         switch (d->props.rc.core.protocol) {
-        case IR_TYPE_NEC:
+        case RC_TYPE_NEC:
                 /* NEC protocol sends repeat code as 0 0 0 FF */
                 if ((key[3-2] == 0x00) && (key[3-3] == 0x00) &&
                     (key[3] == 0xff))
@@ -1924,9 +1924,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_interval      = DEFAULT_RC_INTERVAL,
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -1958,9 +1958,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_interval      = DEFAULT_RC_INTERVAL,
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2017,9 +2017,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_interval      = DEFAULT_RC_INTERVAL,
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2059,9 +2059,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2135,9 +2135,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2179,9 +2179,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2247,9 +2247,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2294,9 +2294,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_NEC_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2363,9 +2363,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2399,9 +2399,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2467,9 +2467,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2511,9 +2511,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_NEC_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2560,9 +2560,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2597,9 +2597,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                         .module_name      = "dib0700",
                         .rc_query         = dib0700_rc_query_old_firmware,
-                        .allowed_protos   = IR_TYPE_RC5 |
-                                            IR_TYPE_RC6 |
-                                            IR_TYPE_NEC,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
         },
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 18828cb282c4..95b1603d5be8 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -190,7 +190,7 @@ struct dvb_rc {
         char *rc_codes;
         u64 protocol;
         u64 allowed_protos;
-        int (*change_protocol)(struct rc_dev *dev, u64 ir_type);
+        int (*change_protocol)(struct rc_dev *dev, u64 rc_type);
         char *module_name;
         int (*rc_query) (struct dvb_usb_device *d);
         int rc_interval;
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
index e030b18ad6d9..cf5f8ca6f685 100644
--- a/drivers/media/dvb/mantis/mantis_input.c
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -99,7 +99,7 @@ static struct rc_keymap ir_mantis_map = {
         .map = {
                 .scan = mantis_ir_table,
                 .size = ARRAY_SIZE(mantis_ir_table),
-                .ir_type = IR_TYPE_UNKNOWN,
+                .rc_type = RC_TYPE_UNKNOWN,
                 .name = RC_MAP_MANTIS,
         }
 };
diff --git a/drivers/media/dvb/siano/smsir.c b/drivers/media/dvb/siano/smsir.c
index ebd73059b518..37bc5c4b8ad8 100644
--- a/drivers/media/dvb/siano/smsir.c
+++ b/drivers/media/dvb/siano/smsir.c
@@ -88,7 +88,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
 
         dev->priv = coredev;
         dev->driver_type = RC_DRIVER_IR_RAW;
-        dev->allowed_protos = IR_TYPE_ALL;
+        dev->allowed_protos = RC_TYPE_ALL;
         dev->map_name = sms_get_board(board_id)->rc_codes;
         dev->driver_name = MODULE_NAME;