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, 34 insertions, 34 deletions

diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index c8c1c9ae6a79..eaafed181d50 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -610,27 +610,27 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_FLYTVPLATINUM_FM:
         case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
         case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM:
-                ir_codes     = &ir_codes_flyvideo_table;
+                ir_codes     = &IR_KEYTABLE(flyvideo);
                 mask_keycode = 0xEC00000;
                 mask_keydown = 0x0040000;
                 break;
         case SAA7134_BOARD_CINERGY400:
         case SAA7134_BOARD_CINERGY600:
         case SAA7134_BOARD_CINERGY600_MK3:
-                ir_codes     = &ir_codes_cinergy_table;
+                ir_codes     = &IR_KEYTABLE(cinergy);
                 mask_keycode = 0x00003f;
                 mask_keyup   = 0x040000;
                 break;
         case SAA7134_BOARD_ECS_TVP3XP:
         case SAA7134_BOARD_ECS_TVP3XP_4CB5:
-                ir_codes     = &ir_codes_eztv_table;
+                ir_codes     = &IR_KEYTABLE(eztv);
                 mask_keycode = 0x00017c;
                 mask_keyup   = 0x000002;
                 polling      = 50; // ms
                 break;
         case SAA7134_BOARD_KWORLD_XPERT:
         case SAA7134_BOARD_AVACSSMARTTV:
-                ir_codes     = &ir_codes_pixelview_table;
+                ir_codes     = &IR_KEYTABLE(pixelview);
                 mask_keycode = 0x00001F;
                 mask_keyup   = 0x000020;
                 polling      = 50; // ms
@@ -647,7 +647,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
         case SAA7134_BOARD_AVERMEDIA_M102:
         case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS:
-                ir_codes     = &ir_codes_avermedia_table;
+                ir_codes     = &IR_KEYTABLE(avermedia);
                 mask_keycode = 0x0007C8;
                 mask_keydown = 0x000010;
                 polling      = 50; // ms
@@ -656,14 +656,14 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
                 break;
         case SAA7134_BOARD_AVERMEDIA_M135A:
-                ir_codes     = &ir_codes_avermedia_m135a_rm_jx_table;
+                ir_codes     = &IR_KEYTABLE(avermedia_m135a_rm_jx);
                 mask_keydown = 0x0040000;
                 mask_keycode = 0xffff;
                 raw_decode   = 1;
                 break;
         case SAA7134_BOARD_AVERMEDIA_777:
         case SAA7134_BOARD_AVERMEDIA_A16AR:
-                ir_codes     = &ir_codes_avermedia_table;
+                ir_codes     = &IR_KEYTABLE(avermedia);
                 mask_keycode = 0x02F200;
                 mask_keydown = 0x000400;
                 polling      = 50; // ms
@@ -672,7 +672,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1);
                 break;
         case SAA7134_BOARD_AVERMEDIA_A16D:
-                ir_codes     = &ir_codes_avermedia_a16d_table;
+                ir_codes     = &IR_KEYTABLE(avermedia_a16d);
                 mask_keycode = 0x02F200;
                 mask_keydown = 0x000400;
                 polling      = 50; /* ms */
@@ -681,14 +681,14 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1);
                 break;
         case SAA7134_BOARD_KWORLD_TERMINATOR:
-                ir_codes     = &ir_codes_pixelview_table;
+                ir_codes     = &IR_KEYTABLE(pixelview);
                 mask_keycode = 0x00001f;
                 mask_keyup   = 0x000060;
                 polling      = 50; // ms
                 break;
         case SAA7134_BOARD_MANLI_MTV001:
         case SAA7134_BOARD_MANLI_MTV002:
-                ir_codes     = &ir_codes_manli_table;
+                ir_codes     = &IR_KEYTABLE(manli);
                 mask_keycode = 0x001f00;
                 mask_keyup   = 0x004000;
                 polling      = 50; /* ms */
@@ -708,25 +708,25 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_BEHOLD_507_9FM:
         case SAA7134_BOARD_BEHOLD_507RDS_MK3:
         case SAA7134_BOARD_BEHOLD_507RDS_MK5:
-                ir_codes     = &ir_codes_manli_table;
+                ir_codes     = &IR_KEYTABLE(manli);
                 mask_keycode = 0x003f00;
                 mask_keyup   = 0x004000;
                 polling      = 50; /* ms */
                 break;
         case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM:
-                ir_codes     = &ir_codes_behold_columbus_table;
+                ir_codes     = &IR_KEYTABLE(behold_columbus);
                 mask_keycode = 0x003f00;
                 mask_keyup   = 0x004000;
                 polling      = 50; // ms
                 break;
         case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
-                ir_codes     = &ir_codes_pctv_sedna_table;
+                ir_codes     = &IR_KEYTABLE(pctv_sedna);
                 mask_keycode = 0x001f00;
                 mask_keyup   = 0x004000;
                 polling      = 50; // ms
                 break;
         case SAA7134_BOARD_GOTVIEW_7135:
-                ir_codes     = &ir_codes_gotview7135_table;
+                ir_codes     = &IR_KEYTABLE(gotview7135);
                 mask_keycode = 0x0003CC;
                 mask_keydown = 0x000010;
                 polling      = 5; /* ms */
@@ -735,80 +735,80 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_VIDEOMATE_TV_PVR:
         case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS:
         case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII:
-                ir_codes     = &ir_codes_videomate_tv_pvr_table;
+                ir_codes     = &IR_KEYTABLE(videomate_tv_pvr);
                 mask_keycode = 0x00003F;
                 mask_keyup   = 0x400000;
                 polling      = 50; // ms
                 break;
         case SAA7134_BOARD_PROTEUS_2309:
-                ir_codes     = &ir_codes_proteus_2309_table;
+                ir_codes     = &IR_KEYTABLE(proteus_2309);
                 mask_keycode = 0x00007F;
                 mask_keyup   = 0x000080;
                 polling      = 50; // ms
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_300:
         case SAA7134_BOARD_VIDEOMATE_DVBT_200:
-                ir_codes     = &ir_codes_videomate_tv_pvr_table;
+                ir_codes     = &IR_KEYTABLE(videomate_tv_pvr);
                 mask_keycode = 0x003F00;
                 mask_keyup   = 0x040000;
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
         case SAA7134_BOARD_FLYDVBT_LR301:
         case SAA7134_BOARD_FLYDVBTDUO:
-                ir_codes     = &ir_codes_flydvb_table;
+                ir_codes     = &IR_KEYTABLE(flydvb);
                 mask_keycode = 0x0001F00;
                 mask_keydown = 0x0040000;
                 break;
         case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
         case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
         case SAA7134_BOARD_ASUSTeK_P7131_ANALOG:
-                ir_codes     = &ir_codes_asus_pc39_table;
+                ir_codes     = &IR_KEYTABLE(asus_pc39);
                 mask_keydown = 0x0040000;
                 rc5_gpio = 1;
                 break;
         case SAA7134_BOARD_ENCORE_ENLTV:
         case SAA7134_BOARD_ENCORE_ENLTV_FM:
-                ir_codes     = &ir_codes_encore_enltv_table;
+                ir_codes     = &IR_KEYTABLE(encore_enltv);
                 mask_keycode = 0x00007f;
                 mask_keyup   = 0x040000;
                 polling      = 50; // ms
                 break;
         case SAA7134_BOARD_ENCORE_ENLTV_FM53:
-                ir_codes     = &ir_codes_encore_enltv_fm53_table;
+                ir_codes     = &IR_KEYTABLE(encore_enltv_fm53);
                 mask_keydown = 0x0040000;
                 mask_keycode = 0x00007f;
                 nec_gpio = 1;
                 break;
         case SAA7134_BOARD_10MOONSTVMASTER3:
-                ir_codes     = &ir_codes_encore_enltv_table;
+                ir_codes     = &IR_KEYTABLE(encore_enltv);
                 mask_keycode = 0x5f80000;
                 mask_keyup   = 0x8000000;
                 polling      = 50; //ms
                 break;
         case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
-                ir_codes     = &ir_codes_genius_tvgo_a11mce_table;
+                ir_codes     = &IR_KEYTABLE(genius_tvgo_a11mce);
                 mask_keycode = 0xff;
                 mask_keydown = 0xf00000;
                 polling = 50; /* ms */
                 break;
         case SAA7134_BOARD_REAL_ANGEL_220:
-                ir_codes     = &ir_codes_real_audio_220_32_keys_table;
+                ir_codes     = &IR_KEYTABLE(real_audio_220_32_keys);
                 mask_keycode = 0x3f00;
                 mask_keyup   = 0x4000;
                 polling = 50; /* ms */
                 break;
         case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
-                ir_codes     = &ir_codes_kworld_plus_tv_analog_table;
+                ir_codes     = &IR_KEYTABLE(kworld_plus_tv_analog);
                 mask_keycode = 0x7f;
                 polling = 40; /* ms */
                 break;
         case SAA7134_BOARD_VIDEOMATE_S350:
-                ir_codes     = &ir_codes_videomate_s350_table;
+                ir_codes     = &IR_KEYTABLE(videomate_s350);
                 mask_keycode = 0x003f00;
                 mask_keydown = 0x040000;
                 break;
         case SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S:
-                ir_codes     = &ir_codes_winfast_table;
+                ir_codes     = &IR_KEYTABLE(winfast);
                 mask_keycode = 0x5f00;
                 mask_keyup   = 0x020000;
                 polling      = 50; /* ms */
@@ -938,24 +938,24 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
                 dev->init_data.name = "Pinnacle PCTV";
                 if (pinnacle_remote == 0) {
                         dev->init_data.get_key = get_key_pinnacle_color;
-                        dev->init_data.ir_codes = &ir_codes_pinnacle_color_table;
+                        dev->init_data.ir_codes = &IR_KEYTABLE(pinnacle_color);
                         info.addr = 0x47;
                 } else {
                         dev->init_data.get_key = get_key_pinnacle_grey;
-                        dev->init_data.ir_codes = &ir_codes_pinnacle_grey_table;
+                        dev->init_data.ir_codes = &IR_KEYTABLE(pinnacle_grey);
                         info.addr = 0x47;
                 }
                 break;
         case SAA7134_BOARD_UPMOST_PURPLE_TV:
                 dev->init_data.name = "Purple TV";
                 dev->init_data.get_key = get_key_purpletv;
-                dev->init_data.ir_codes = &ir_codes_purpletv_table;
+                dev->init_data.ir_codes = &IR_KEYTABLE(purpletv);
                 info.addr = 0x7a;
                 break;
         case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
                 dev->init_data.name = "MSI TV@nywhere Plus";
                 dev->init_data.get_key = get_key_msi_tvanywhere_plus;
-                dev->init_data.ir_codes = &ir_codes_msi_tvanywhere_plus_table;
+                dev->init_data.ir_codes = &IR_KEYTABLE(msi_tvanywhere_plus);
                 info.addr = 0x30;
                 /* MSI TV@nywhere Plus controller doesn't seem to
                    respond to probes unless we read something from
@@ -969,7 +969,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
         case SAA7134_BOARD_HAUPPAUGE_HVR1110:
                 dev->init_data.name = "HVR 1110";
                 dev->init_data.get_key = get_key_hvr1110;
-                dev->init_data.ir_codes = &ir_codes_hauppauge_new_table;
+                dev->init_data.ir_codes = &IR_KEYTABLE(hauppauge_new);
                 info.addr = 0x71;
                 break;
         case SAA7134_BOARD_BEHOLD_607FM_MK3:
@@ -987,7 +987,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
         case SAA7134_BOARD_BEHOLD_X7:
                 dev->init_data.name = "BeholdTV";
                 dev->init_data.get_key = get_key_beholdm6xx;
-                dev->init_data.ir_codes = &ir_codes_behold_table;
+                dev->init_data.ir_codes = &IR_KEYTABLE(behold);
                 dev->init_data.type = IR_TYPE_NEC;
                 info.addr = 0x2d;
                 break;
@@ -998,7 +998,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
         case SAA7134_BOARD_FLYDVB_TRIO:
                 dev->init_data.name = "FlyDVB Trio";
                 dev->init_data.get_key = get_key_flydvb_trio;
-                dev->init_data.ir_codes = &ir_codes_flydvb_table;
+                dev->init_data.ir_codes = &IR_KEYTABLE(flydvb);
                 info.addr = 0x0b;
                 break;
         default: