ir-keymaps: Fix some trobles on a bad patch

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Due to some merge conflicts, I had to manually fix one patch. It seems
that I missed to convert some fields.

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

1 files changed, 20 insertions, 22 deletions

diff --git a/linux/drivers/media/common/ir-keymaps.c b/linux/drivers/media/common/ir-keymaps.c
index 5ce47d775..b2f9a9693 100644
--- a/linux/drivers/media/common/ir-keymaps.c
+++ b/linux/drivers/media/common/ir-keymaps.c
@@ -2764,7 +2764,7 @@ EXPORT_SYMBOL_GPL(ir_codes_kworld_plus_tv_analog_table);
 /* Kaiomy TVnPC U2
    Mauro Carvalho Chehab <mchehab@infradead.org>
  */
-IR_KEYTAB_TYPE ir_codes_kaiomy[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_kaiomy[] = {
 	{ 0x43, KEY_POWER2},
 	{ 0x01, KEY_LIST},
 	{ 0x0b, KEY_ZOOM},
@@ -2812,9 +2812,9 @@ struct ir_scancode_table ir_codes_kaiomy_table = {
 	.scan = ir_codes_kaiomy,
 	.size = ARRAY_SIZE(ir_codes_kaiomy),
 };
-EXPORT_SYMBOL_GPL(ir_codes_kaiomy);
+EXPORT_SYMBOL_GPL(ir_codes_kaiomy_table);
 
-IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_avermedia_a16d[] = {
 	{ 0x20, KEY_LIST},
 	{ 0x00, KEY_POWER},
 	{ 0x28, KEY_1},
@@ -2854,12 +2854,12 @@ struct ir_scancode_table ir_codes_avermedia_a16d_table = {
 	.scan = ir_codes_avermedia_a16d,
 	.size = ARRAY_SIZE(ir_codes_avermedia_a16d),
 };
-EXPORT_SYMBOL_GPL(ir_codes_avermedia_a16d);
+EXPORT_SYMBOL_GPL(ir_codes_avermedia_a16d_table);
 
 /* Encore ENLTV-FM v5.3
    Mauro Carvalho Chehab <mchehab@infradead.org>
  */
-IR_KEYTAB_TYPE ir_codes_encore_enltv_fm53[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_encore_enltv_fm53[] = {
 	{ 0x10, KEY_POWER2},
 	{ 0x06, KEY_MUTE},
 
@@ -2901,10 +2901,10 @@ struct ir_scancode_table ir_codes_encore_enltv_fm53_table = {
 	.scan = ir_codes_encore_enltv_fm53,
 	.size = ARRAY_SIZE(ir_codes_encore_enltv_fm53),
 };
-EXPORT_SYMBOL_GPL(ir_codes_encore_enltv_fm53);
+EXPORT_SYMBOL_GPL(ir_codes_encore_enltv_fm53_table);
 
 /* Zogis Real Audio 220 - 32 keys IR */
-IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_real_audio_220_32_keys[] = {
 	{ 0x1c, KEY_RADIO},
 	{ 0x12, KEY_POWER2},
 
@@ -2945,12 +2945,12 @@ struct ir_scancode_table ir_codes_real_audio_220_32_keys_table = {
 	.scan = ir_codes_real_audio_220_32_keys,
 	.size = ARRAY_SIZE(ir_codes_real_audio_220_32_keys),
 };
-EXPORT_SYMBOL_GPL(ir_codes_real_audio_220_32_keys);
+EXPORT_SYMBOL_GPL(ir_codes_real_audio_220_32_keys_table);
 
 /* ATI TV Wonder HD 600 USB
    Devin Heitmueller <devin.heitmueller@gmail.com>
  */
-IR_KEYTAB_TYPE ir_codes_ati_tv_wonder_hd_600[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_ati_tv_wonder_hd_600[] = {
 	{ 0x00, KEY_RECORD},		/* Row 1 */
 	{ 0x01, KEY_PLAYPAUSE},
 	{ 0x02, KEY_STOP},
@@ -2980,12 +2980,12 @@ struct ir_scancode_table ir_codes_ati_tv_wonder_hd_600_table = {
 	.scan = ir_codes_ati_tv_wonder_hd_600,
 	.size = ARRAY_SIZE(ir_codes_ati_tv_wonder_hd_600),
 };
-EXPORT_SYMBOL_GPL(ir_codes_ati_tv_wonder_hd_600);
+EXPORT_SYMBOL_GPL(ir_codes_ati_tv_wonder_hd_600_table);
 
 /* DVBWorld remotes
    Igor M. Liplianin <liplianin@me.by>
  */
-IR_KEYTAB_TYPE ir_codes_dm1105_nec[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_dm1105_nec[] = {
 	{ 0x0a, KEY_POWER2},		/* power */
 	{ 0x0c, KEY_MUTE},		/* mute */
 	{ 0x11, KEY_1},
@@ -3022,13 +3022,12 @@ struct ir_scancode_table ir_codes_dm1105_nec_table = {
 	.scan = ir_codes_dm1105_nec,
 	.size = ARRAY_SIZE(ir_codes_dm1105_nec),
 };
-EXPORT_SYMBOL_GPL(ir_codes_dm1105_nec);
-
+EXPORT_SYMBOL_GPL(ir_codes_dm1105_nec_table);
 
 /* Terratec Cinergy Hybrid T USB XS
    Devin Heitmueller <dheitmueller@linuxtv.org>
  */
-IR_KEYTAB_TYPE ir_codes_terratec_cinergy_xs[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_terratec_cinergy_xs[] = {
 	{ 0x41, KEY_HOME},
 	{ 0x01, KEY_POWER},
 	{ 0x42, KEY_MENU},
@@ -3081,12 +3080,12 @@ struct ir_scancode_table ir_codes_terratec_cinergy_xs_table = {
 	.scan = ir_codes_terratec_cinergy_xs,
 	.size = ARRAY_SIZE(ir_codes_terratec_cinergy_xs),
 };
-EXPORT_SYMBOL_GPL(ir_codes_terratec_cinergy_xs);
+EXPORT_SYMBOL_GPL(ir_codes_terratec_cinergy_xs_table);
 
 /* EVGA inDtube
    Devin Heitmueller <devin.heitmueller@gmail.com>
  */
-IR_KEYTAB_TYPE ir_codes_evga_indtube[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_evga_indtube[] = {
 	{ 0x12, KEY_POWER},
 	{ 0x02, KEY_MODE},	/* TV */
 	{ 0x14, KEY_MUTE},
@@ -3108,9 +3107,9 @@ struct ir_scancode_table ir_codes_evga_indtube_table = {
 	.scan = ir_codes_evga_indtube,
 	.size = ARRAY_SIZE(ir_codes_evga_indtube),
 };
-EXPORT_SYMBOL_GPL(ir_codes_evga_indtube);
+EXPORT_SYMBOL_GPL(ir_codes_evga_indtube_table);
 
-IR_KEYTAB_TYPE ir_codes_videomate_s350[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_videomate_s350[] = {
 	{ 0x00, KEY_TV},
 	{ 0x01, KEY_DVD},
 	{ 0x04, KEY_RECORD},
@@ -3160,13 +3159,12 @@ struct ir_scancode_table ir_codes_videomate_s350_table = {
 	.scan = ir_codes_videomate_s350,
 	.size = ARRAY_SIZE(ir_codes_videomate_s350),
 };
-EXPORT_SYMBOL_GPL(ir_codes_videomate_s350);
-
+EXPORT_SYMBOL_GPL(ir_codes_videomate_s350_table);
 
 /* GADMEI UTV330+ RM008Z remote
    Shine Liu <shinel@foxmail.com>
  */
-IR_KEYTAB_TYPE ir_codes_gadmei_rm008z[IR_KEYTAB_SIZE] = {
+static struct ir_scancode ir_codes_gadmei_rm008z[] = {
 	{ 0x14, KEY_POWER2},		/* POWER OFF */
 	{ 0x0c, KEY_MUTE},		/* MUTE */
 
@@ -3208,4 +3206,4 @@ struct ir_scancode_table ir_codes_gadmei_rm008z_table = {
 	.scan = ir_codes_gadmei_rm008z,
 	.size = ARRAY_SIZE(ir_codes_gadmei_rm008z),
 };
-EXPORT_SYMBOL_GPL(ir_codes_gadmei_rm008z);
+EXPORT_SYMBOL_GPL(ir_codes_gadmei_rm008z_table);