V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table

[net-next-2.6.git] / drivers / media / dvb / dvb-usb / opera1.c

diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index 830557696ae6ff0a39c043833fa16b44e4f0c0a6..dfb81ff1d9a7735cac3a118ba702eb69383299ba 100644 (file)
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -35,7 +35,7 @@
 struct opera1_state {
        u32 last_key_pressed;
 };
-struct opera_rc_keys {
+struct ir_codes_opera_table {
        u32 keycode;
        u32 event;
 };
@@ -331,7 +331,7 @@ static int opera1_pid_filter_control(struct dvb_usb_adapter *adap, int onoff)
        return 0;
 }
 
-static struct dvb_usb_rc_key opera1_rc_keys[] = {
+static struct dvb_usb_rc_key ir_codes_opera1_table[] = {
        {0x5fa0, KEY_1},
        {0x51af, KEY_2},
        {0x5da2, KEY_3},
@@ -404,12 +404,12 @@ static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state)
 
                send_key = (send_key & 0xffff) | 0x0100;
 
-               for (i = 0; i < ARRAY_SIZE(opera1_rc_keys); i++) {
-                       if (rc5_scan(&opera1_rc_keys[i]) == (send_key & 0xffff)) {
+               for (i = 0; i < ARRAY_SIZE(ir_codes_opera1_table); i++) {
+                       if (rc5_scan(&ir_codes_opera1_table[i]) == (send_key & 0xffff)) {
                                *state = REMOTE_KEY_PRESSED;
-                               *event = opera1_rc_keys[i].event;
+                               *event = ir_codes_opera1_table[i].event;
                                opst->last_key_pressed =
-                                       opera1_rc_keys[i].event;
+                                       ir_codes_opera1_table[i].event;
                                break;
                        }
                        opst->last_key_pressed = 0;
@@ -498,8 +498,8 @@ static struct dvb_usb_device_properties opera1_properties = {
        .power_ctrl = opera1_power_ctrl,
        .i2c_algo = &opera1_i2c_algo,
 
-       .rc_key_map = opera1_rc_keys,
-       .rc_key_map_size = ARRAY_SIZE(opera1_rc_keys),
+       .rc_key_map = ir_codes_opera1_table,
+       .rc_key_map_size = ARRAY_SIZE(ir_codes_opera1_table),
        .rc_interval = 200,
        .rc_query = opera1_rc_query,
        .read_mac_address = opera1_read_mac_address,