V4L/DVB: ir: use IR_KEYTABLE where an IR table is needed

Replaces most of the occurences of IR keytables on V4L drivers by a macro
that evaluates to provide the name of the exported symbol.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 6af69d5c8499..607a0be2ec63 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -322,13 +322,13 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 name        = "Pixelview";
                 ir->get_key = get_key_pixelview;
                 ir_type     = IR_TYPE_OTHER;
-                ir_codes    = &ir_codes_empty_table;
+                ir_codes    = &IR_KEYTABLE(empty);
                 break;
         case 0x4b:
                 name        = "PV951";
                 ir->get_key = get_key_pv951;
                 ir_type     = IR_TYPE_OTHER;
-                ir_codes    = &ir_codes_pv951_table;
+                ir_codes    = &IR_KEYTABLE(pv951);
                 break;
         case 0x18:
         case 0x1f:
@@ -337,22 +337,22 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 ir->get_key = get_key_haup;
                 ir_type     = IR_TYPE_RC5;
                 if (hauppauge == 1) {
-                        ir_codes    = &ir_codes_hauppauge_new_table;
+                        ir_codes    = &IR_KEYTABLE(hauppauge_new);
                 } else {
-                        ir_codes    = &ir_codes_rc5_tv_table;
+                        ir_codes    = &IR_KEYTABLE(rc5_tv);
                 }
                 break;
         case 0x30:
                 name        = "KNC One";
                 ir->get_key = get_key_knc1;
                 ir_type     = IR_TYPE_OTHER;
-                ir_codes    = &ir_codes_empty_table;
+                ir_codes    = &IR_KEYTABLE(empty);
                 break;
         case 0x6b:
                 name        = "FusionHDTV";
                 ir->get_key = get_key_fusionhdtv;
                 ir_type     = IR_TYPE_RC5;
-                ir_codes    = &ir_codes_fusionhdtv_mce_table;
+                ir_codes    = &IR_KEYTABLE(fusionhdtv_mce);
                 break;
         case 0x0b:
         case 0x47:
@@ -365,9 +365,9 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                         ir_type     = IR_TYPE_RC5;
                         ir->get_key = get_key_haup_xvr;
                         if (hauppauge == 1) {
-                                ir_codes    = &ir_codes_hauppauge_new_table;
+                                ir_codes    = &IR_KEYTABLE(hauppauge_new);
                         } else {
-                                ir_codes    = &ir_codes_rc5_tv_table;
+                                ir_codes    = &IR_KEYTABLE(rc5_tv);
                         }
                 } else {
                         /* Handled by saa7134-input */
@@ -379,7 +379,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 name        = "AVerMedia Cardbus remote";
                 ir->get_key = get_key_avermedia_cardbus;
                 ir_type     = IR_TYPE_OTHER;
-                ir_codes    = &ir_codes_avermedia_cardbus_table;
+                ir_codes    = &IR_KEYTABLE(avermedia_cardbus);
                 break;
         }