diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-11-17 12:20:52 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:50 -0500 |
commit | 52b661449aecc47e652a164c0d8078b31e10aca0 (patch) | |
tree | 42af14cf5b6df82b841ec4bf38f22da54fc4439b /drivers/media/rc/keymaps | |
parent | 29e3ec19d5c88d534ced219d3962d67243e4d310 (diff) |
[media] rc: Rename remote controller type to rc_type instead of ir_type
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g <$i >a && mv a $i; done
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc/keymaps')
86 files changed, 86 insertions, 86 deletions
diff --git a/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c index b17283176ecd..0ea0aeee6e78 100644 --- a/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c +++ b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | |||
@@ -67,7 +67,7 @@ static struct rc_keymap adstech_dvb_t_pci_map = { | |||
67 | .map = { | 67 | .map = { |
68 | .scan = adstech_dvb_t_pci, | 68 | .scan = adstech_dvb_t_pci, |
69 | .size = ARRAY_SIZE(adstech_dvb_t_pci), | 69 | .size = ARRAY_SIZE(adstech_dvb_t_pci), |
70 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 70 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
71 | .name = RC_MAP_ADSTECH_DVB_T_PCI, | 71 | .name = RC_MAP_ADSTECH_DVB_T_PCI, |
72 | } | 72 | } |
73 | }; | 73 | }; |
diff --git a/drivers/media/rc/keymaps/rc-alink-dtu-m.c b/drivers/media/rc/keymaps/rc-alink-dtu-m.c index ddfee7f8093d..b0ec1c81a080 100644 --- a/drivers/media/rc/keymaps/rc-alink-dtu-m.c +++ b/drivers/media/rc/keymaps/rc-alink-dtu-m.c | |||
@@ -46,7 +46,7 @@ static struct rc_keymap alink_dtu_m_map = { | |||
46 | .map = { | 46 | .map = { |
47 | .scan = alink_dtu_m, | 47 | .scan = alink_dtu_m, |
48 | .size = ARRAY_SIZE(alink_dtu_m), | 48 | .size = ARRAY_SIZE(alink_dtu_m), |
49 | .ir_type = IR_TYPE_NEC, | 49 | .rc_type = RC_TYPE_NEC, |
50 | .name = RC_MAP_ALINK_DTU_M, | 50 | .name = RC_MAP_ALINK_DTU_M, |
51 | } | 51 | } |
52 | }; | 52 | }; |
diff --git a/drivers/media/rc/keymaps/rc-anysee.c b/drivers/media/rc/keymaps/rc-anysee.c index 30d70498cfed..9bfe60e663b4 100644 --- a/drivers/media/rc/keymaps/rc-anysee.c +++ b/drivers/media/rc/keymaps/rc-anysee.c | |||
@@ -71,7 +71,7 @@ static struct rc_keymap anysee_map = { | |||
71 | .map = { | 71 | .map = { |
72 | .scan = anysee, | 72 | .scan = anysee, |
73 | .size = ARRAY_SIZE(anysee), | 73 | .size = ARRAY_SIZE(anysee), |
74 | .ir_type = IR_TYPE_NEC, | 74 | .rc_type = RC_TYPE_NEC, |
75 | .name = RC_MAP_ANYSEE, | 75 | .name = RC_MAP_ANYSEE, |
76 | } | 76 | } |
77 | }; | 77 | }; |
diff --git a/drivers/media/rc/keymaps/rc-apac-viewcomp.c b/drivers/media/rc/keymaps/rc-apac-viewcomp.c index 0ef2b562baf0..a32840dd4df4 100644 --- a/drivers/media/rc/keymaps/rc-apac-viewcomp.c +++ b/drivers/media/rc/keymaps/rc-apac-viewcomp.c | |||
@@ -58,7 +58,7 @@ static struct rc_keymap apac_viewcomp_map = { | |||
58 | .map = { | 58 | .map = { |
59 | .scan = apac_viewcomp, | 59 | .scan = apac_viewcomp, |
60 | .size = ARRAY_SIZE(apac_viewcomp), | 60 | .size = ARRAY_SIZE(apac_viewcomp), |
61 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 61 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
62 | .name = RC_MAP_APAC_VIEWCOMP, | 62 | .name = RC_MAP_APAC_VIEWCOMP, |
63 | } | 63 | } |
64 | }; | 64 | }; |
diff --git a/drivers/media/rc/keymaps/rc-asus-pc39.c b/drivers/media/rc/keymaps/rc-asus-pc39.c index 2996e0a3b8d5..f86bfb7bf271 100644 --- a/drivers/media/rc/keymaps/rc-asus-pc39.c +++ b/drivers/media/rc/keymaps/rc-asus-pc39.c | |||
@@ -69,7 +69,7 @@ static struct rc_keymap asus_pc39_map = { | |||
69 | .map = { | 69 | .map = { |
70 | .scan = asus_pc39, | 70 | .scan = asus_pc39, |
71 | .size = ARRAY_SIZE(asus_pc39), | 71 | .size = ARRAY_SIZE(asus_pc39), |
72 | .ir_type = IR_TYPE_RC5, | 72 | .rc_type = RC_TYPE_RC5, |
73 | .name = RC_MAP_ASUS_PC39, | 73 | .name = RC_MAP_ASUS_PC39, |
74 | } | 74 | } |
75 | }; | 75 | }; |
diff --git a/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c b/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c index 8edfd293d010..0cefe1c5536d 100644 --- a/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c +++ b/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | |||
@@ -47,7 +47,7 @@ static struct rc_keymap ati_tv_wonder_hd_600_map = { | |||
47 | .map = { | 47 | .map = { |
48 | .scan = ati_tv_wonder_hd_600, | 48 | .scan = ati_tv_wonder_hd_600, |
49 | .size = ARRAY_SIZE(ati_tv_wonder_hd_600), | 49 | .size = ARRAY_SIZE(ati_tv_wonder_hd_600), |
50 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 50 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
51 | .name = RC_MAP_ATI_TV_WONDER_HD_600, | 51 | .name = RC_MAP_ATI_TV_WONDER_HD_600, |
52 | } | 52 | } |
53 | }; | 53 | }; |
diff --git a/drivers/media/rc/keymaps/rc-avermedia-a16d.c b/drivers/media/rc/keymaps/rc-avermedia-a16d.c index 12f043587f2e..43525c8c111a 100644 --- a/drivers/media/rc/keymaps/rc-avermedia-a16d.c +++ b/drivers/media/rc/keymaps/rc-avermedia-a16d.c | |||
@@ -53,7 +53,7 @@ static struct rc_keymap avermedia_a16d_map = { | |||
53 | .map = { | 53 | .map = { |
54 | .scan = avermedia_a16d, | 54 | .scan = avermedia_a16d, |
55 | .size = ARRAY_SIZE(avermedia_a16d), | 55 | .size = ARRAY_SIZE(avermedia_a16d), |
56 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 56 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
57 | .name = RC_MAP_AVERMEDIA_A16D, | 57 | .name = RC_MAP_AVERMEDIA_A16D, |
58 | } | 58 | } |
59 | }; | 59 | }; |
diff --git a/drivers/media/rc/keymaps/rc-avermedia-cardbus.c b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c index 2a945b02e8ca..2d528cac2caf 100644 --- a/drivers/media/rc/keymaps/rc-avermedia-cardbus.c +++ b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c | |||
@@ -75,7 +75,7 @@ static struct rc_keymap avermedia_cardbus_map = { | |||
75 | .map = { | 75 | .map = { |
76 | .scan = avermedia_cardbus, | 76 | .scan = avermedia_cardbus, |
77 | .size = ARRAY_SIZE(avermedia_cardbus), | 77 | .size = ARRAY_SIZE(avermedia_cardbus), |
78 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 78 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
79 | .name = RC_MAP_AVERMEDIA_CARDBUS, | 79 | .name = RC_MAP_AVERMEDIA_CARDBUS, |
80 | } | 80 | } |
81 | }; | 81 | }; |
diff --git a/drivers/media/rc/keymaps/rc-avermedia-dvbt.c b/drivers/media/rc/keymaps/rc-avermedia-dvbt.c index 39dde6222875..e45b67ffcf3f 100644 --- a/drivers/media/rc/keymaps/rc-avermedia-dvbt.c +++ b/drivers/media/rc/keymaps/rc-avermedia-dvbt.c | |||
@@ -56,7 +56,7 @@ static struct rc_keymap avermedia_dvbt_map = { | |||
56 | .map = { | 56 | .map = { |
57 | .scan = avermedia_dvbt, | 57 | .scan = avermedia_dvbt, |
58 | .size = ARRAY_SIZE(avermedia_dvbt), | 58 | .size = ARRAY_SIZE(avermedia_dvbt), |
59 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 59 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
60 | .name = RC_MAP_AVERMEDIA_DVBT, | 60 | .name = RC_MAP_AVERMEDIA_DVBT, |
61 | } | 61 | } |
62 | }; | 62 | }; |
diff --git a/drivers/media/rc/keymaps/rc-avermedia-m135a.c b/drivers/media/rc/keymaps/rc-avermedia-m135a.c index e4471fb2ad1e..d5622c507d5f 100644 --- a/drivers/media/rc/keymaps/rc-avermedia-m135a.c +++ b/drivers/media/rc/keymaps/rc-avermedia-m135a.c | |||
@@ -125,7 +125,7 @@ static struct rc_keymap avermedia_m135a_map = { | |||
125 | .map = { | 125 | .map = { |
126 | .scan = avermedia_m135a, | 126 | .scan = avermedia_m135a, |
127 | .size = ARRAY_SIZE(avermedia_m135a), | 127 | .size = ARRAY_SIZE(avermedia_m135a), |
128 | .ir_type = IR_TYPE_NEC, | 128 | .rc_type = RC_TYPE_NEC, |
129 | .name = RC_MAP_AVERMEDIA_M135A, | 129 | .name = RC_MAP_AVERMEDIA_M135A, |
130 | } | 130 | } |
131 | }; | 131 | }; |
diff --git a/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c b/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c index cf8d45717cb3..b0e10bec82b2 100644 --- a/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c +++ b/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | |||
@@ -73,7 +73,7 @@ static struct rc_keymap avermedia_m733a_rm_k6_map = { | |||
73 | .map = { | 73 | .map = { |
74 | .scan = avermedia_m733a_rm_k6, | 74 | .scan = avermedia_m733a_rm_k6, |
75 | .size = ARRAY_SIZE(avermedia_m733a_rm_k6), | 75 | .size = ARRAY_SIZE(avermedia_m733a_rm_k6), |
76 | .ir_type = IR_TYPE_NEC, | 76 | .rc_type = RC_TYPE_NEC, |
77 | .name = RC_MAP_AVERMEDIA_M733A_RM_K6, | 77 | .name = RC_MAP_AVERMEDIA_M733A_RM_K6, |
78 | } | 78 | } |
79 | }; | 79 | }; |
diff --git a/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c b/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c index 9ee60906c861..334846654a55 100644 --- a/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c +++ b/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | |||
@@ -57,7 +57,7 @@ static struct rc_keymap avermedia_rm_ks_map = { | |||
57 | .map = { | 57 | .map = { |
58 | .scan = avermedia_rm_ks, | 58 | .scan = avermedia_rm_ks, |
59 | .size = ARRAY_SIZE(avermedia_rm_ks), | 59 | .size = ARRAY_SIZE(avermedia_rm_ks), |
60 | .ir_type = IR_TYPE_NEC, | 60 | .rc_type = RC_TYPE_NEC, |
61 | .name = RC_MAP_AVERMEDIA_RM_KS, | 61 | .name = RC_MAP_AVERMEDIA_RM_KS, |
62 | } | 62 | } |
63 | }; | 63 | }; |
diff --git a/drivers/media/rc/keymaps/rc-avermedia.c b/drivers/media/rc/keymaps/rc-avermedia.c index 21effd5bfb0d..cfde54e15d5c 100644 --- a/drivers/media/rc/keymaps/rc-avermedia.c +++ b/drivers/media/rc/keymaps/rc-avermedia.c | |||
@@ -64,7 +64,7 @@ static struct rc_keymap avermedia_map = { | |||
64 | .map = { | 64 | .map = { |
65 | .scan = avermedia, | 65 | .scan = avermedia, |
66 | .size = ARRAY_SIZE(avermedia), | 66 | .size = ARRAY_SIZE(avermedia), |
67 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 67 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
68 | .name = RC_MAP_AVERMEDIA, | 68 | .name = RC_MAP_AVERMEDIA, |
69 | } | 69 | } |
70 | }; | 70 | }; |
diff --git a/drivers/media/rc/keymaps/rc-avertv-303.c b/drivers/media/rc/keymaps/rc-avertv-303.c index 971c59d6f9d6..ae586632b48e 100644 --- a/drivers/media/rc/keymaps/rc-avertv-303.c +++ b/drivers/media/rc/keymaps/rc-avertv-303.c | |||
@@ -63,7 +63,7 @@ static struct rc_keymap avertv_303_map = { | |||
63 | .map = { | 63 | .map = { |
64 | .scan = avertv_303, | 64 | .scan = avertv_303, |
65 | .size = ARRAY_SIZE(avertv_303), | 65 | .size = ARRAY_SIZE(avertv_303), |
66 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 66 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
67 | .name = RC_MAP_AVERTV_303, | 67 | .name = RC_MAP_AVERTV_303, |
68 | } | 68 | } |
69 | }; | 69 | }; |
diff --git a/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c b/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c index e0876147d471..579fafedd35a 100644 --- a/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c +++ b/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | |||
@@ -80,7 +80,7 @@ static struct rc_keymap azurewave_ad_tu700_map = { | |||
80 | .map = { | 80 | .map = { |
81 | .scan = azurewave_ad_tu700, | 81 | .scan = azurewave_ad_tu700, |
82 | .size = ARRAY_SIZE(azurewave_ad_tu700), | 82 | .size = ARRAY_SIZE(azurewave_ad_tu700), |
83 | .ir_type = IR_TYPE_NEC, | 83 | .rc_type = RC_TYPE_NEC, |
84 | .name = RC_MAP_AZUREWAVE_AD_TU700, | 84 | .name = RC_MAP_AZUREWAVE_AD_TU700, |
85 | } | 85 | } |
86 | }; | 86 | }; |
diff --git a/drivers/media/rc/keymaps/rc-behold-columbus.c b/drivers/media/rc/keymaps/rc-behold-columbus.c index 9f56c98fef5b..6abb712c9e04 100644 --- a/drivers/media/rc/keymaps/rc-behold-columbus.c +++ b/drivers/media/rc/keymaps/rc-behold-columbus.c | |||
@@ -86,7 +86,7 @@ static struct rc_keymap behold_columbus_map = { | |||
86 | .map = { | 86 | .map = { |
87 | .scan = behold_columbus, | 87 | .scan = behold_columbus, |
88 | .size = ARRAY_SIZE(behold_columbus), | 88 | .size = ARRAY_SIZE(behold_columbus), |
89 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 89 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
90 | .name = RC_MAP_BEHOLD_COLUMBUS, | 90 | .name = RC_MAP_BEHOLD_COLUMBUS, |
91 | } | 91 | } |
92 | }; | 92 | }; |
diff --git a/drivers/media/rc/keymaps/rc-behold.c b/drivers/media/rc/keymaps/rc-behold.c index abc140b2098b..5694185a869d 100644 --- a/drivers/media/rc/keymaps/rc-behold.c +++ b/drivers/media/rc/keymaps/rc-behold.c | |||
@@ -119,7 +119,7 @@ static struct rc_keymap behold_map = { | |||
119 | .map = { | 119 | .map = { |
120 | .scan = behold, | 120 | .scan = behold, |
121 | .size = ARRAY_SIZE(behold), | 121 | .size = ARRAY_SIZE(behold), |
122 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 122 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
123 | .name = RC_MAP_BEHOLD, | 123 | .name = RC_MAP_BEHOLD, |
124 | } | 124 | } |
125 | }; | 125 | }; |
diff --git a/drivers/media/rc/keymaps/rc-budget-ci-old.c b/drivers/media/rc/keymaps/rc-budget-ci-old.c index 64c2ac913338..99f73232c714 100644 --- a/drivers/media/rc/keymaps/rc-budget-ci-old.c +++ b/drivers/media/rc/keymaps/rc-budget-ci-old.c | |||
@@ -70,7 +70,7 @@ static struct rc_keymap budget_ci_old_map = { | |||
70 | .map = { | 70 | .map = { |
71 | .scan = budget_ci_old, | 71 | .scan = budget_ci_old, |
72 | .size = ARRAY_SIZE(budget_ci_old), | 72 | .size = ARRAY_SIZE(budget_ci_old), |
73 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 73 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
74 | .name = RC_MAP_BUDGET_CI_OLD, | 74 | .name = RC_MAP_BUDGET_CI_OLD, |
75 | } | 75 | } |
76 | }; | 76 | }; |
diff --git a/drivers/media/rc/keymaps/rc-cinergy-1400.c b/drivers/media/rc/keymaps/rc-cinergy-1400.c index 074f2c2c2c61..b504ddd1a922 100644 --- a/drivers/media/rc/keymaps/rc-cinergy-1400.c +++ b/drivers/media/rc/keymaps/rc-cinergy-1400.c | |||
@@ -62,7 +62,7 @@ static struct rc_keymap cinergy_1400_map = { | |||
62 | .map = { | 62 | .map = { |
63 | .scan = cinergy_1400, | 63 | .scan = cinergy_1400, |
64 | .size = ARRAY_SIZE(cinergy_1400), | 64 | .size = ARRAY_SIZE(cinergy_1400), |
65 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 65 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
66 | .name = RC_MAP_CINERGY_1400, | 66 | .name = RC_MAP_CINERGY_1400, |
67 | } | 67 | } |
68 | }; | 68 | }; |
diff --git a/drivers/media/rc/keymaps/rc-cinergy.c b/drivers/media/rc/keymaps/rc-cinergy.c index cf84c3dba742..8bf02f154339 100644 --- a/drivers/media/rc/keymaps/rc-cinergy.c +++ b/drivers/media/rc/keymaps/rc-cinergy.c | |||
@@ -56,7 +56,7 @@ static struct rc_keymap cinergy_map = { | |||
56 | .map = { | 56 | .map = { |
57 | .scan = cinergy, | 57 | .scan = cinergy, |
58 | .size = ARRAY_SIZE(cinergy), | 58 | .size = ARRAY_SIZE(cinergy), |
59 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 59 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
60 | .name = RC_MAP_CINERGY, | 60 | .name = RC_MAP_CINERGY, |
61 | } | 61 | } |
62 | }; | 62 | }; |
diff --git a/drivers/media/rc/keymaps/rc-dib0700-nec.c b/drivers/media/rc/keymaps/rc-dib0700-nec.c index ae1832038fbe..47d5476d50e8 100644 --- a/drivers/media/rc/keymaps/rc-dib0700-nec.c +++ b/drivers/media/rc/keymaps/rc-dib0700-nec.c | |||
@@ -102,7 +102,7 @@ static struct rc_keymap dib0700_nec_map = { | |||
102 | .map = { | 102 | .map = { |
103 | .scan = dib0700_nec_table, | 103 | .scan = dib0700_nec_table, |
104 | .size = ARRAY_SIZE(dib0700_nec_table), | 104 | .size = ARRAY_SIZE(dib0700_nec_table), |
105 | .ir_type = IR_TYPE_NEC, | 105 | .rc_type = RC_TYPE_NEC, |
106 | .name = RC_MAP_DIB0700_NEC_TABLE, | 106 | .name = RC_MAP_DIB0700_NEC_TABLE, |
107 | } | 107 | } |
108 | }; | 108 | }; |
diff --git a/drivers/media/rc/keymaps/rc-dib0700-rc5.c b/drivers/media/rc/keymaps/rc-dib0700-rc5.c index 4a4797cfd77d..1d09921f076f 100644 --- a/drivers/media/rc/keymaps/rc-dib0700-rc5.c +++ b/drivers/media/rc/keymaps/rc-dib0700-rc5.c | |||
@@ -213,7 +213,7 @@ static struct rc_keymap dib0700_rc5_map = { | |||
213 | .map = { | 213 | .map = { |
214 | .scan = dib0700_rc5_table, | 214 | .scan = dib0700_rc5_table, |
215 | .size = ARRAY_SIZE(dib0700_rc5_table), | 215 | .size = ARRAY_SIZE(dib0700_rc5_table), |
216 | .ir_type = IR_TYPE_RC5, | 216 | .rc_type = RC_TYPE_RC5, |
217 | .name = RC_MAP_DIB0700_RC5_TABLE, | 217 | .name = RC_MAP_DIB0700_RC5_TABLE, |
218 | } | 218 | } |
219 | }; | 219 | }; |
diff --git a/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c b/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c index 63e469e2dd21..8ae726b568ed 100644 --- a/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c +++ b/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | |||
@@ -76,7 +76,7 @@ static struct rc_keymap digitalnow_tinytwin_map = { | |||
76 | .map = { | 76 | .map = { |
77 | .scan = digitalnow_tinytwin, | 77 | .scan = digitalnow_tinytwin, |
78 | .size = ARRAY_SIZE(digitalnow_tinytwin), | 78 | .size = ARRAY_SIZE(digitalnow_tinytwin), |
79 | .ir_type = IR_TYPE_NEC, | 79 | .rc_type = RC_TYPE_NEC, |
80 | .name = RC_MAP_DIGITALNOW_TINYTWIN, | 80 | .name = RC_MAP_DIGITALNOW_TINYTWIN, |
81 | } | 81 | } |
82 | }; | 82 | }; |
diff --git a/drivers/media/rc/keymaps/rc-digittrade.c b/drivers/media/rc/keymaps/rc-digittrade.c index 5dece78e19c5..206469fb028e 100644 --- a/drivers/media/rc/keymaps/rc-digittrade.c +++ b/drivers/media/rc/keymaps/rc-digittrade.c | |||
@@ -60,7 +60,7 @@ static struct rc_keymap digittrade_map = { | |||
60 | .map = { | 60 | .map = { |
61 | .scan = digittrade, | 61 | .scan = digittrade, |
62 | .size = ARRAY_SIZE(digittrade), | 62 | .size = ARRAY_SIZE(digittrade), |
63 | .ir_type = IR_TYPE_NEC, | 63 | .rc_type = RC_TYPE_NEC, |
64 | .name = RC_MAP_DIGITTRADE, | 64 | .name = RC_MAP_DIGITTRADE, |
65 | } | 65 | } |
66 | }; | 66 | }; |
diff --git a/drivers/media/rc/keymaps/rc-dm1105-nec.c b/drivers/media/rc/keymaps/rc-dm1105-nec.c index 90684d0efea3..ba6fb0be9d3c 100644 --- a/drivers/media/rc/keymaps/rc-dm1105-nec.c +++ b/drivers/media/rc/keymaps/rc-dm1105-nec.c | |||
@@ -54,7 +54,7 @@ static struct rc_keymap dm1105_nec_map = { | |||
54 | .map = { | 54 | .map = { |
55 | .scan = dm1105_nec, | 55 | .scan = dm1105_nec, |
56 | .size = ARRAY_SIZE(dm1105_nec), | 56 | .size = ARRAY_SIZE(dm1105_nec), |
57 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 57 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
58 | .name = RC_MAP_DM1105_NEC, | 58 | .name = RC_MAP_DM1105_NEC, |
59 | } | 59 | } |
60 | }; | 60 | }; |
diff --git a/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c index 8a4027af964a..b703937f160b 100644 --- a/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c +++ b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | |||
@@ -56,7 +56,7 @@ static struct rc_keymap dntv_live_dvb_t_map = { | |||
56 | .map = { | 56 | .map = { |
57 | .scan = dntv_live_dvb_t, | 57 | .scan = dntv_live_dvb_t, |
58 | .size = ARRAY_SIZE(dntv_live_dvb_t), | 58 | .size = ARRAY_SIZE(dntv_live_dvb_t), |
59 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 59 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
60 | .name = RC_MAP_DNTV_LIVE_DVB_T, | 60 | .name = RC_MAP_DNTV_LIVE_DVB_T, |
61 | } | 61 | } |
62 | }; | 62 | }; |
diff --git a/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c b/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c index 6f4d60764d59..b0126b2fceab 100644 --- a/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c +++ b/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | |||
@@ -75,7 +75,7 @@ static struct rc_keymap dntv_live_dvbt_pro_map = { | |||
75 | .map = { | 75 | .map = { |
76 | .scan = dntv_live_dvbt_pro, | 76 | .scan = dntv_live_dvbt_pro, |
77 | .size = ARRAY_SIZE(dntv_live_dvbt_pro), | 77 | .size = ARRAY_SIZE(dntv_live_dvbt_pro), |
78 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 78 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
79 | .name = RC_MAP_DNTV_LIVE_DVBT_PRO, | 79 | .name = RC_MAP_DNTV_LIVE_DVBT_PRO, |
80 | } | 80 | } |
81 | }; | 81 | }; |
diff --git a/drivers/media/rc/keymaps/rc-em-terratec.c b/drivers/media/rc/keymaps/rc-em-terratec.c index 3130c9c29e6b..57bcd556821d 100644 --- a/drivers/media/rc/keymaps/rc-em-terratec.c +++ b/drivers/media/rc/keymaps/rc-em-terratec.c | |||
@@ -47,7 +47,7 @@ static struct rc_keymap em_terratec_map = { | |||
47 | .map = { | 47 | .map = { |
48 | .scan = em_terratec, | 48 | .scan = em_terratec, |
49 | .size = ARRAY_SIZE(em_terratec), | 49 | .size = ARRAY_SIZE(em_terratec), |
50 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 50 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
51 | .name = RC_MAP_EM_TERRATEC, | 51 | .name = RC_MAP_EM_TERRATEC, |
52 | } | 52 | } |
53 | }; | 53 | }; |
diff --git a/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c b/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c index 4b816967877e..97e01f4cb76a 100644 --- a/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c +++ b/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | |||
@@ -59,7 +59,7 @@ static struct rc_keymap encore_enltv_fm53_map = { | |||
59 | .map = { | 59 | .map = { |
60 | .scan = encore_enltv_fm53, | 60 | .scan = encore_enltv_fm53, |
61 | .size = ARRAY_SIZE(encore_enltv_fm53), | 61 | .size = ARRAY_SIZE(encore_enltv_fm53), |
62 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 62 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
63 | .name = RC_MAP_ENCORE_ENLTV_FM53, | 63 | .name = RC_MAP_ENCORE_ENLTV_FM53, |
64 | } | 64 | } |
65 | }; | 65 | }; |
diff --git a/drivers/media/rc/keymaps/rc-encore-enltv.c b/drivers/media/rc/keymaps/rc-encore-enltv.c index 9fabffd28cc9..d3030cf74839 100644 --- a/drivers/media/rc/keymaps/rc-encore-enltv.c +++ b/drivers/media/rc/keymaps/rc-encore-enltv.c | |||
@@ -90,7 +90,7 @@ static struct rc_keymap encore_enltv_map = { | |||
90 | .map = { | 90 | .map = { |
91 | .scan = encore_enltv, | 91 | .scan = encore_enltv, |
92 | .size = ARRAY_SIZE(encore_enltv), | 92 | .size = ARRAY_SIZE(encore_enltv), |
93 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 93 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
94 | .name = RC_MAP_ENCORE_ENLTV, | 94 | .name = RC_MAP_ENCORE_ENLTV, |
95 | } | 95 | } |
96 | }; | 96 | }; |
diff --git a/drivers/media/rc/keymaps/rc-encore-enltv2.c b/drivers/media/rc/keymaps/rc-encore-enltv2.c index efefd5166618..1871b32efa98 100644 --- a/drivers/media/rc/keymaps/rc-encore-enltv2.c +++ b/drivers/media/rc/keymaps/rc-encore-enltv2.c | |||
@@ -68,7 +68,7 @@ static struct rc_keymap encore_enltv2_map = { | |||
68 | .map = { | 68 | .map = { |
69 | .scan = encore_enltv2, | 69 | .scan = encore_enltv2, |
70 | .size = ARRAY_SIZE(encore_enltv2), | 70 | .size = ARRAY_SIZE(encore_enltv2), |
71 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 71 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
72 | .name = RC_MAP_ENCORE_ENLTV2, | 72 | .name = RC_MAP_ENCORE_ENLTV2, |
73 | } | 73 | } |
74 | }; | 74 | }; |
diff --git a/drivers/media/rc/keymaps/rc-evga-indtube.c b/drivers/media/rc/keymaps/rc-evga-indtube.c index 3f3fb13813b3..192d7f8287f4 100644 --- a/drivers/media/rc/keymaps/rc-evga-indtube.c +++ b/drivers/media/rc/keymaps/rc-evga-indtube.c | |||
@@ -39,7 +39,7 @@ static struct rc_keymap evga_indtube_map = { | |||
39 | .map = { | 39 | .map = { |
40 | .scan = evga_indtube, | 40 | .scan = evga_indtube, |
41 | .size = ARRAY_SIZE(evga_indtube), | 41 | .size = ARRAY_SIZE(evga_indtube), |
42 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 42 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
43 | .name = RC_MAP_EVGA_INDTUBE, | 43 | .name = RC_MAP_EVGA_INDTUBE, |
44 | } | 44 | } |
45 | }; | 45 | }; |
diff --git a/drivers/media/rc/keymaps/rc-eztv.c b/drivers/media/rc/keymaps/rc-eztv.c index 660907a78db9..fe3ab5e31a7f 100644 --- a/drivers/media/rc/keymaps/rc-eztv.c +++ b/drivers/media/rc/keymaps/rc-eztv.c | |||
@@ -74,7 +74,7 @@ static struct rc_keymap eztv_map = { | |||
74 | .map = { | 74 | .map = { |
75 | .scan = eztv, | 75 | .scan = eztv, |
76 | .size = ARRAY_SIZE(eztv), | 76 | .size = ARRAY_SIZE(eztv), |
77 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 77 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
78 | .name = RC_MAP_EZTV, | 78 | .name = RC_MAP_EZTV, |
79 | } | 79 | } |
80 | }; | 80 | }; |
diff --git a/drivers/media/rc/keymaps/rc-flydvb.c b/drivers/media/rc/keymaps/rc-flydvb.c index a173c81035f4..f48249e070f5 100644 --- a/drivers/media/rc/keymaps/rc-flydvb.c +++ b/drivers/media/rc/keymaps/rc-flydvb.c | |||
@@ -55,7 +55,7 @@ static struct rc_keymap flydvb_map = { | |||
55 | .map = { | 55 | .map = { |
56 | .scan = flydvb, | 56 | .scan = flydvb, |
57 | .size = ARRAY_SIZE(flydvb), | 57 | .size = ARRAY_SIZE(flydvb), |
58 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 58 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
59 | .name = RC_MAP_FLYDVB, | 59 | .name = RC_MAP_FLYDVB, |
60 | } | 60 | } |
61 | }; | 61 | }; |
diff --git a/drivers/media/rc/keymaps/rc-flyvideo.c b/drivers/media/rc/keymaps/rc-flyvideo.c index 9c73043cbdba..59713fb46820 100644 --- a/drivers/media/rc/keymaps/rc-flyvideo.c +++ b/drivers/media/rc/keymaps/rc-flyvideo.c | |||
@@ -48,7 +48,7 @@ static struct rc_keymap flyvideo_map = { | |||
48 | .map = { | 48 | .map = { |
49 | .scan = flyvideo, | 49 | .scan = flyvideo, |
50 | .size = ARRAY_SIZE(flyvideo), | 50 | .size = ARRAY_SIZE(flyvideo), |
51 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 51 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
52 | .name = RC_MAP_FLYVIDEO, | 52 | .name = RC_MAP_FLYVIDEO, |
53 | } | 53 | } |
54 | }; | 54 | }; |
diff --git a/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c b/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c index cdb10389b10e..e69458d8eb1b 100644 --- a/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c +++ b/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | |||
@@ -76,7 +76,7 @@ static struct rc_keymap fusionhdtv_mce_map = { | |||
76 | .map = { | 76 | .map = { |
77 | .scan = fusionhdtv_mce, | 77 | .scan = fusionhdtv_mce, |
78 | .size = ARRAY_SIZE(fusionhdtv_mce), | 78 | .size = ARRAY_SIZE(fusionhdtv_mce), |
79 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 79 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
80 | .name = RC_MAP_FUSIONHDTV_MCE, | 80 | .name = RC_MAP_FUSIONHDTV_MCE, |
81 | } | 81 | } |
82 | }; | 82 | }; |
diff --git a/drivers/media/rc/keymaps/rc-gadmei-rm008z.c b/drivers/media/rc/keymaps/rc-gadmei-rm008z.c index c16c0d1263ac..13587b8d6a4a 100644 --- a/drivers/media/rc/keymaps/rc-gadmei-rm008z.c +++ b/drivers/media/rc/keymaps/rc-gadmei-rm008z.c | |||
@@ -59,7 +59,7 @@ static struct rc_keymap gadmei_rm008z_map = { | |||
59 | .map = { | 59 | .map = { |
60 | .scan = gadmei_rm008z, | 60 | .scan = gadmei_rm008z, |
61 | .size = ARRAY_SIZE(gadmei_rm008z), | 61 | .size = ARRAY_SIZE(gadmei_rm008z), |
62 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 62 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
63 | .name = RC_MAP_GADMEI_RM008Z, | 63 | .name = RC_MAP_GADMEI_RM008Z, |
64 | } | 64 | } |
65 | }; | 65 | }; |
diff --git a/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c b/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c index 89f8e384e52a..2304bf677b3d 100644 --- a/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c +++ b/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | |||
@@ -62,7 +62,7 @@ static struct rc_keymap genius_tvgo_a11mce_map = { | |||
62 | .map = { | 62 | .map = { |
63 | .scan = genius_tvgo_a11mce, | 63 | .scan = genius_tvgo_a11mce, |
64 | .size = ARRAY_SIZE(genius_tvgo_a11mce), | 64 | .size = ARRAY_SIZE(genius_tvgo_a11mce), |
65 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 65 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
66 | .name = RC_MAP_GENIUS_TVGO_A11MCE, | 66 | .name = RC_MAP_GENIUS_TVGO_A11MCE, |
67 | } | 67 | } |
68 | }; | 68 | }; |
diff --git a/drivers/media/rc/keymaps/rc-gotview7135.c b/drivers/media/rc/keymaps/rc-gotview7135.c index 52f025bb35f6..b5be7bfbb7f0 100644 --- a/drivers/media/rc/keymaps/rc-gotview7135.c +++ b/drivers/media/rc/keymaps/rc-gotview7135.c | |||
@@ -57,7 +57,7 @@ static struct rc_keymap gotview7135_map = { | |||
57 | .map = { | 57 | .map = { |
58 | .scan = gotview7135, | 58 | .scan = gotview7135, |
59 | .size = ARRAY_SIZE(gotview7135), | 59 | .size = ARRAY_SIZE(gotview7135), |
60 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 60 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
61 | .name = RC_MAP_GOTVIEW7135, | 61 | .name = RC_MAP_GOTVIEW7135, |
62 | } | 62 | } |
63 | }; | 63 | }; |
diff --git a/drivers/media/rc/keymaps/rc-hauppauge-new.c b/drivers/media/rc/keymaps/rc-hauppauge-new.c index c6f8cd7c5186..c60f845dd930 100644 --- a/drivers/media/rc/keymaps/rc-hauppauge-new.c +++ b/drivers/media/rc/keymaps/rc-hauppauge-new.c | |||
@@ -78,7 +78,7 @@ static struct rc_keymap hauppauge_new_map = { | |||
78 | .map = { | 78 | .map = { |
79 | .scan = hauppauge_new, | 79 | .scan = hauppauge_new, |
80 | .size = ARRAY_SIZE(hauppauge_new), | 80 | .size = ARRAY_SIZE(hauppauge_new), |
81 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 81 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
82 | .name = RC_MAP_HAUPPAUGE_NEW, | 82 | .name = RC_MAP_HAUPPAUGE_NEW, |
83 | } | 83 | } |
84 | }; | 84 | }; |
diff --git a/drivers/media/rc/keymaps/rc-imon-mce.c b/drivers/media/rc/keymaps/rc-imon-mce.c index e49f350e3a0d..4ce902f87701 100644 --- a/drivers/media/rc/keymaps/rc-imon-mce.c +++ b/drivers/media/rc/keymaps/rc-imon-mce.c | |||
@@ -120,7 +120,7 @@ static struct rc_keymap imon_mce_map = { | |||
120 | .scan = imon_mce, | 120 | .scan = imon_mce, |
121 | .size = ARRAY_SIZE(imon_mce), | 121 | .size = ARRAY_SIZE(imon_mce), |
122 | /* its RC6, but w/a hardware decoder */ | 122 | /* its RC6, but w/a hardware decoder */ |
123 | .ir_type = IR_TYPE_RC6, | 123 | .rc_type = RC_TYPE_RC6, |
124 | .name = RC_MAP_IMON_MCE, | 124 | .name = RC_MAP_IMON_MCE, |
125 | } | 125 | } |
126 | }; | 126 | }; |
diff --git a/drivers/media/rc/keymaps/rc-imon-pad.c b/drivers/media/rc/keymaps/rc-imon-pad.c index bc4db72f02e6..6d4633af4393 100644 --- a/drivers/media/rc/keymaps/rc-imon-pad.c +++ b/drivers/media/rc/keymaps/rc-imon-pad.c | |||
@@ -134,7 +134,7 @@ static struct rc_keymap imon_pad_map = { | |||
134 | .scan = imon_pad, | 134 | .scan = imon_pad, |
135 | .size = ARRAY_SIZE(imon_pad), | 135 | .size = ARRAY_SIZE(imon_pad), |
136 | /* actual protocol details unknown, hardware decoder */ | 136 | /* actual protocol details unknown, hardware decoder */ |
137 | .ir_type = IR_TYPE_OTHER, | 137 | .rc_type = RC_TYPE_OTHER, |
138 | .name = RC_MAP_IMON_PAD, | 138 | .name = RC_MAP_IMON_PAD, |
139 | } | 139 | } |
140 | }; | 140 | }; |
diff --git a/drivers/media/rc/keymaps/rc-iodata-bctv7e.c b/drivers/media/rc/keymaps/rc-iodata-bctv7e.c index ef6600259fc0..c5208f10e7c0 100644 --- a/drivers/media/rc/keymaps/rc-iodata-bctv7e.c +++ b/drivers/media/rc/keymaps/rc-iodata-bctv7e.c | |||
@@ -66,7 +66,7 @@ static struct rc_keymap iodata_bctv7e_map = { | |||
66 | .map = { | 66 | .map = { |
67 | .scan = iodata_bctv7e, | 67 | .scan = iodata_bctv7e, |
68 | .size = ARRAY_SIZE(iodata_bctv7e), | 68 | .size = ARRAY_SIZE(iodata_bctv7e), |
69 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 69 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
70 | .name = RC_MAP_IODATA_BCTV7E, | 70 | .name = RC_MAP_IODATA_BCTV7E, |
71 | } | 71 | } |
72 | }; | 72 | }; |
diff --git a/drivers/media/rc/keymaps/rc-kaiomy.c b/drivers/media/rc/keymaps/rc-kaiomy.c index 4c7883ba0f15..1b6da7ffb8f1 100644 --- a/drivers/media/rc/keymaps/rc-kaiomy.c +++ b/drivers/media/rc/keymaps/rc-kaiomy.c | |||
@@ -65,7 +65,7 @@ static struct rc_keymap kaiomy_map = { | |||
65 | .map = { | 65 | .map = { |
66 | .scan = kaiomy, | 66 | .scan = kaiomy, |
67 | .size = ARRAY_SIZE(kaiomy), | 67 | .size = ARRAY_SIZE(kaiomy), |
68 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 68 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
69 | .name = RC_MAP_KAIOMY, | 69 | .name = RC_MAP_KAIOMY, |
70 | } | 70 | } |
71 | }; | 71 | }; |
diff --git a/drivers/media/rc/keymaps/rc-kworld-315u.c b/drivers/media/rc/keymaps/rc-kworld-315u.c index 618c817374e6..3418e075938c 100644 --- a/drivers/media/rc/keymaps/rc-kworld-315u.c +++ b/drivers/media/rc/keymaps/rc-kworld-315u.c | |||
@@ -61,7 +61,7 @@ static struct rc_keymap kworld_315u_map = { | |||
61 | .map = { | 61 | .map = { |
62 | .scan = kworld_315u, | 62 | .scan = kworld_315u, |
63 | .size = ARRAY_SIZE(kworld_315u), | 63 | .size = ARRAY_SIZE(kworld_315u), |
64 | .ir_type = IR_TYPE_NEC, | 64 | .rc_type = RC_TYPE_NEC, |
65 | .name = RC_MAP_KWORLD_315U, | 65 | .name = RC_MAP_KWORLD_315U, |
66 | } | 66 | } |
67 | }; | 67 | }; |
diff --git a/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c index 366732f1f7b7..4d681eb7aaf4 100644 --- a/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c +++ b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c | |||
@@ -77,7 +77,7 @@ static struct rc_keymap kworld_plus_tv_analog_map = { | |||
77 | .map = { | 77 | .map = { |
78 | .scan = kworld_plus_tv_analog, | 78 | .scan = kworld_plus_tv_analog, |
79 | .size = ARRAY_SIZE(kworld_plus_tv_analog), | 79 | .size = ARRAY_SIZE(kworld_plus_tv_analog), |
80 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 80 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
81 | .name = RC_MAP_KWORLD_PLUS_TV_ANALOG, | 81 | .name = RC_MAP_KWORLD_PLUS_TV_ANALOG, |
82 | } | 82 | } |
83 | }; | 83 | }; |
diff --git a/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c b/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c index 7521315fd876..ebdd1226bada 100644 --- a/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c +++ b/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | |||
@@ -77,7 +77,7 @@ static struct rc_keymap leadtek_y04g0051_map = { | |||
77 | .map = { | 77 | .map = { |
78 | .scan = leadtek_y04g0051, | 78 | .scan = leadtek_y04g0051, |
79 | .size = ARRAY_SIZE(leadtek_y04g0051), | 79 | .size = ARRAY_SIZE(leadtek_y04g0051), |
80 | .ir_type = IR_TYPE_NEC, | 80 | .rc_type = RC_TYPE_NEC, |
81 | .name = RC_MAP_LEADTEK_Y04G0051, | 81 | .name = RC_MAP_LEADTEK_Y04G0051, |
82 | } | 82 | } |
83 | }; | 83 | }; |
diff --git a/drivers/media/rc/keymaps/rc-lirc.c b/drivers/media/rc/keymaps/rc-lirc.c index 9c8577d6e497..6d8a64170fd9 100644 --- a/drivers/media/rc/keymaps/rc-lirc.c +++ b/drivers/media/rc/keymaps/rc-lirc.c | |||
@@ -19,7 +19,7 @@ static struct rc_keymap lirc_map = { | |||
19 | .map = { | 19 | .map = { |
20 | .scan = lirc, | 20 | .scan = lirc, |
21 | .size = ARRAY_SIZE(lirc), | 21 | .size = ARRAY_SIZE(lirc), |
22 | .ir_type = IR_TYPE_LIRC, | 22 | .rc_type = RC_TYPE_LIRC, |
23 | .name = RC_MAP_LIRC, | 23 | .name = RC_MAP_LIRC, |
24 | } | 24 | } |
25 | }; | 25 | }; |
diff --git a/drivers/media/rc/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c index 40dcf0b4e21a..ca7e2acb682a 100644 --- a/drivers/media/rc/keymaps/rc-lme2510.c +++ b/drivers/media/rc/keymaps/rc-lme2510.c | |||
@@ -46,7 +46,7 @@ static struct rc_keymap lme2510_map = { | |||
46 | .map = { | 46 | .map = { |
47 | .scan = lme2510_rc, | 47 | .scan = lme2510_rc, |
48 | .size = ARRAY_SIZE(lme2510_rc), | 48 | .size = ARRAY_SIZE(lme2510_rc), |
49 | .ir_type = IR_TYPE_UNKNOWN, | 49 | .rc_type = RC_TYPE_UNKNOWN, |
50 | .name = RC_MAP_LME2510, | 50 | .name = RC_MAP_LME2510, |
51 | } | 51 | } |
52 | }; | 52 | }; |
diff --git a/drivers/media/rc/keymaps/rc-manli.c b/drivers/media/rc/keymaps/rc-manli.c index 0f590b3d01c0..056cf52dce60 100644 --- a/drivers/media/rc/keymaps/rc-manli.c +++ b/drivers/media/rc/keymaps/rc-manli.c | |||
@@ -112,7 +112,7 @@ static struct rc_keymap manli_map = { | |||
112 | .map = { | 112 | .map = { |
113 | .scan = manli, | 113 | .scan = manli, |
114 | .size = ARRAY_SIZE(manli), | 114 | .size = ARRAY_SIZE(manli), |
115 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 115 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
116 | .name = RC_MAP_MANLI, | 116 | .name = RC_MAP_MANLI, |
117 | } | 117 | } |
118 | }; | 118 | }; |
diff --git a/drivers/media/rc/keymaps/rc-msi-digivox-ii.c b/drivers/media/rc/keymaps/rc-msi-digivox-ii.c index 67237fbf9e4b..3a14d31bec4d 100644 --- a/drivers/media/rc/keymaps/rc-msi-digivox-ii.c +++ b/drivers/media/rc/keymaps/rc-msi-digivox-ii.c | |||
@@ -45,7 +45,7 @@ static struct rc_keymap msi_digivox_ii_map = { | |||
45 | .map = { | 45 | .map = { |
46 | .scan = msi_digivox_ii, | 46 | .scan = msi_digivox_ii, |
47 | .size = ARRAY_SIZE(msi_digivox_ii), | 47 | .size = ARRAY_SIZE(msi_digivox_ii), |
48 | .ir_type = IR_TYPE_NEC, | 48 | .rc_type = RC_TYPE_NEC, |
49 | .name = RC_MAP_MSI_DIGIVOX_II, | 49 | .name = RC_MAP_MSI_DIGIVOX_II, |
50 | } | 50 | } |
51 | }; | 51 | }; |
diff --git a/drivers/media/rc/keymaps/rc-msi-digivox-iii.c b/drivers/media/rc/keymaps/rc-msi-digivox-iii.c index 882056e52ef9..16c5b0aa8c43 100644 --- a/drivers/media/rc/keymaps/rc-msi-digivox-iii.c +++ b/drivers/media/rc/keymaps/rc-msi-digivox-iii.c | |||
@@ -63,7 +63,7 @@ static struct rc_keymap msi_digivox_iii_map = { | |||
63 | .map = { | 63 | .map = { |
64 | .scan = msi_digivox_iii, | 64 | .scan = msi_digivox_iii, |
65 | .size = ARRAY_SIZE(msi_digivox_iii), | 65 | .size = ARRAY_SIZE(msi_digivox_iii), |
66 | .ir_type = IR_TYPE_NEC, | 66 | .rc_type = RC_TYPE_NEC, |
67 | .name = RC_MAP_MSI_DIGIVOX_III, | 67 | .name = RC_MAP_MSI_DIGIVOX_III, |
68 | } | 68 | } |
69 | }; | 69 | }; |
diff --git a/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c index eb8e42c18ff9..d4c91020fc07 100644 --- a/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c +++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | |||
@@ -101,7 +101,7 @@ static struct rc_keymap msi_tvanywhere_plus_map = { | |||
101 | .map = { | 101 | .map = { |
102 | .scan = msi_tvanywhere_plus, | 102 | .scan = msi_tvanywhere_plus, |
103 | .size = ARRAY_SIZE(msi_tvanywhere_plus), | 103 | .size = ARRAY_SIZE(msi_tvanywhere_plus), |
104 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 104 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
105 | .name = RC_MAP_MSI_TVANYWHERE_PLUS, | 105 | .name = RC_MAP_MSI_TVANYWHERE_PLUS, |
106 | } | 106 | } |
107 | }; | 107 | }; |
diff --git a/drivers/media/rc/keymaps/rc-msi-tvanywhere.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c index ef411854f067..aec064cb7b15 100644 --- a/drivers/media/rc/keymaps/rc-msi-tvanywhere.c +++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c | |||
@@ -47,7 +47,7 @@ static struct rc_keymap msi_tvanywhere_map = { | |||
47 | .map = { | 47 | .map = { |
48 | .scan = msi_tvanywhere, | 48 | .scan = msi_tvanywhere, |
49 | .size = ARRAY_SIZE(msi_tvanywhere), | 49 | .size = ARRAY_SIZE(msi_tvanywhere), |
50 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 50 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
51 | .name = RC_MAP_MSI_TVANYWHERE, | 51 | .name = RC_MAP_MSI_TVANYWHERE, |
52 | } | 52 | } |
53 | }; | 53 | }; |
diff --git a/drivers/media/rc/keymaps/rc-nebula.c b/drivers/media/rc/keymaps/rc-nebula.c index ccc50eb402ec..2c44b90d48c9 100644 --- a/drivers/media/rc/keymaps/rc-nebula.c +++ b/drivers/media/rc/keymaps/rc-nebula.c | |||
@@ -74,7 +74,7 @@ static struct rc_keymap nebula_map = { | |||
74 | .map = { | 74 | .map = { |
75 | .scan = nebula, | 75 | .scan = nebula, |
76 | .size = ARRAY_SIZE(nebula), | 76 | .size = ARRAY_SIZE(nebula), |
77 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 77 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
78 | .name = RC_MAP_NEBULA, | 78 | .name = RC_MAP_NEBULA, |
79 | } | 79 | } |
80 | }; | 80 | }; |
diff --git a/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c index e1b54d20db60..929084bcaa4d 100644 --- a/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c +++ b/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | |||
@@ -83,7 +83,7 @@ static struct rc_keymap nec_terratec_cinergy_xs_map = { | |||
83 | .map = { | 83 | .map = { |
84 | .scan = nec_terratec_cinergy_xs, | 84 | .scan = nec_terratec_cinergy_xs, |
85 | .size = ARRAY_SIZE(nec_terratec_cinergy_xs), | 85 | .size = ARRAY_SIZE(nec_terratec_cinergy_xs), |
86 | .ir_type = IR_TYPE_NEC, | 86 | .rc_type = RC_TYPE_NEC, |
87 | .name = RC_MAP_NEC_TERRATEC_CINERGY_XS, | 87 | .name = RC_MAP_NEC_TERRATEC_CINERGY_XS, |
88 | } | 88 | } |
89 | }; | 89 | }; |
diff --git a/drivers/media/rc/keymaps/rc-norwood.c b/drivers/media/rc/keymaps/rc-norwood.c index e5849a6b3f05..7fe774628edc 100644 --- a/drivers/media/rc/keymaps/rc-norwood.c +++ b/drivers/media/rc/keymaps/rc-norwood.c | |||
@@ -63,7 +63,7 @@ static struct rc_keymap norwood_map = { | |||
63 | .map = { | 63 | .map = { |
64 | .scan = norwood, | 64 | .scan = norwood, |
65 | .size = ARRAY_SIZE(norwood), | 65 | .size = ARRAY_SIZE(norwood), |
66 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 66 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
67 | .name = RC_MAP_NORWOOD, | 67 | .name = RC_MAP_NORWOOD, |
68 | } | 68 | } |
69 | }; | 69 | }; |
diff --git a/drivers/media/rc/keymaps/rc-npgtech.c b/drivers/media/rc/keymaps/rc-npgtech.c index b9ece1e90296..a9cbcde98a30 100644 --- a/drivers/media/rc/keymaps/rc-npgtech.c +++ b/drivers/media/rc/keymaps/rc-npgtech.c | |||
@@ -58,7 +58,7 @@ static struct rc_keymap npgtech_map = { | |||
58 | .map = { | 58 | .map = { |
59 | .scan = npgtech, | 59 | .scan = npgtech, |
60 | .size = ARRAY_SIZE(npgtech), | 60 | .size = ARRAY_SIZE(npgtech), |
61 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 61 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
62 | .name = RC_MAP_NPGTECH, | 62 | .name = RC_MAP_NPGTECH, |
63 | } | 63 | } |
64 | }; | 64 | }; |
diff --git a/drivers/media/rc/keymaps/rc-pctv-sedna.c b/drivers/media/rc/keymaps/rc-pctv-sedna.c index 4129bb44a25b..68b33b31f6bf 100644 --- a/drivers/media/rc/keymaps/rc-pctv-sedna.c +++ b/drivers/media/rc/keymaps/rc-pctv-sedna.c | |||
@@ -58,7 +58,7 @@ static struct rc_keymap pctv_sedna_map = { | |||
58 | .map = { | 58 | .map = { |
59 | .scan = pctv_sedna, | 59 | .scan = pctv_sedna, |
60 | .size = ARRAY_SIZE(pctv_sedna), | 60 | .size = ARRAY_SIZE(pctv_sedna), |
61 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 61 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
62 | .name = RC_MAP_PCTV_SEDNA, | 62 | .name = RC_MAP_PCTV_SEDNA, |
63 | } | 63 | } |
64 | }; | 64 | }; |
diff --git a/drivers/media/rc/keymaps/rc-pinnacle-color.c b/drivers/media/rc/keymaps/rc-pinnacle-color.c index 326e023ce126..364ccde87a04 100644 --- a/drivers/media/rc/keymaps/rc-pinnacle-color.c +++ b/drivers/media/rc/keymaps/rc-pinnacle-color.c | |||
@@ -72,7 +72,7 @@ static struct rc_keymap pinnacle_color_map = { | |||
72 | .map = { | 72 | .map = { |
73 | .scan = pinnacle_color, | 73 | .scan = pinnacle_color, |
74 | .size = ARRAY_SIZE(pinnacle_color), | 74 | .size = ARRAY_SIZE(pinnacle_color), |
75 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 75 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
76 | .name = RC_MAP_PINNACLE_COLOR, | 76 | .name = RC_MAP_PINNACLE_COLOR, |
77 | } | 77 | } |
78 | }; | 78 | }; |
diff --git a/drivers/media/rc/keymaps/rc-pinnacle-grey.c b/drivers/media/rc/keymaps/rc-pinnacle-grey.c index 14cb772515c6..993eff72f233 100644 --- a/drivers/media/rc/keymaps/rc-pinnacle-grey.c +++ b/drivers/media/rc/keymaps/rc-pinnacle-grey.c | |||
@@ -67,7 +67,7 @@ static struct rc_keymap pinnacle_grey_map = { | |||
67 | .map = { | 67 | .map = { |
68 | .scan = pinnacle_grey, | 68 | .scan = pinnacle_grey, |
69 | .size = ARRAY_SIZE(pinnacle_grey), | 69 | .size = ARRAY_SIZE(pinnacle_grey), |
70 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 70 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
71 | .name = RC_MAP_PINNACLE_GREY, | 71 | .name = RC_MAP_PINNACLE_GREY, |
72 | } | 72 | } |
73 | }; | 73 | }; |
diff --git a/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c b/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c index 835bf4ef8de7..56e6a7e203ec 100644 --- a/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c +++ b/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | |||
@@ -51,7 +51,7 @@ static struct rc_keymap pinnacle_pctv_hd_map = { | |||
51 | .map = { | 51 | .map = { |
52 | .scan = pinnacle_pctv_hd, | 52 | .scan = pinnacle_pctv_hd, |
53 | .size = ARRAY_SIZE(pinnacle_pctv_hd), | 53 | .size = ARRAY_SIZE(pinnacle_pctv_hd), |
54 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 54 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
55 | .name = RC_MAP_PINNACLE_PCTV_HD, | 55 | .name = RC_MAP_PINNACLE_PCTV_HD, |
56 | } | 56 | } |
57 | }; | 57 | }; |
diff --git a/drivers/media/rc/keymaps/rc-pixelview-mk12.c b/drivers/media/rc/keymaps/rc-pixelview-mk12.c index 5a735d569a8b..84f89ebd8998 100644 --- a/drivers/media/rc/keymaps/rc-pixelview-mk12.c +++ b/drivers/media/rc/keymaps/rc-pixelview-mk12.c | |||
@@ -61,7 +61,7 @@ static struct rc_keymap pixelview_map = { | |||
61 | .map = { | 61 | .map = { |
62 | .scan = pixelview_mk12, | 62 | .scan = pixelview_mk12, |
63 | .size = ARRAY_SIZE(pixelview_mk12), | 63 | .size = ARRAY_SIZE(pixelview_mk12), |
64 | .ir_type = IR_TYPE_NEC, | 64 | .rc_type = RC_TYPE_NEC, |
65 | .name = RC_MAP_PIXELVIEW_MK12, | 65 | .name = RC_MAP_PIXELVIEW_MK12, |
66 | } | 66 | } |
67 | }; | 67 | }; |
diff --git a/drivers/media/rc/keymaps/rc-pixelview-new.c b/drivers/media/rc/keymaps/rc-pixelview-new.c index 7bbbbf5735e6..703f86bca132 100644 --- a/drivers/media/rc/keymaps/rc-pixelview-new.c +++ b/drivers/media/rc/keymaps/rc-pixelview-new.c | |||
@@ -61,7 +61,7 @@ static struct rc_keymap pixelview_new_map = { | |||
61 | .map = { | 61 | .map = { |
62 | .scan = pixelview_new, | 62 | .scan = pixelview_new, |
63 | .size = ARRAY_SIZE(pixelview_new), | 63 | .size = ARRAY_SIZE(pixelview_new), |
64 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 64 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
65 | .name = RC_MAP_PIXELVIEW_NEW, | 65 | .name = RC_MAP_PIXELVIEW_NEW, |
66 | } | 66 | } |
67 | }; | 67 | }; |
diff --git a/drivers/media/rc/keymaps/rc-pixelview.c b/drivers/media/rc/keymaps/rc-pixelview.c index 82ff12e182a0..5a50aa7e411d 100644 --- a/drivers/media/rc/keymaps/rc-pixelview.c +++ b/drivers/media/rc/keymaps/rc-pixelview.c | |||
@@ -60,7 +60,7 @@ static struct rc_keymap pixelview_map = { | |||
60 | .map = { | 60 | .map = { |
61 | .scan = pixelview, | 61 | .scan = pixelview, |
62 | .size = ARRAY_SIZE(pixelview), | 62 | .size = ARRAY_SIZE(pixelview), |
63 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 63 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
64 | .name = RC_MAP_PIXELVIEW, | 64 | .name = RC_MAP_PIXELVIEW, |
65 | } | 65 | } |
66 | }; | 66 | }; |
diff --git a/drivers/media/rc/keymaps/rc-powercolor-real-angel.c b/drivers/media/rc/keymaps/rc-powercolor-real-angel.c index 7cef8190a224..4eec4371f7d1 100644 --- a/drivers/media/rc/keymaps/rc-powercolor-real-angel.c +++ b/drivers/media/rc/keymaps/rc-powercolor-real-angel.c | |||
@@ -59,7 +59,7 @@ static struct rc_keymap powercolor_real_angel_map = { | |||
59 | .map = { | 59 | .map = { |
60 | .scan = powercolor_real_angel, | 60 | .scan = powercolor_real_angel, |
61 | .size = ARRAY_SIZE(powercolor_real_angel), | 61 | .size = ARRAY_SIZE(powercolor_real_angel), |
62 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 62 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
63 | .name = RC_MAP_POWERCOLOR_REAL_ANGEL, | 63 | .name = RC_MAP_POWERCOLOR_REAL_ANGEL, |
64 | } | 64 | } |
65 | }; | 65 | }; |
diff --git a/drivers/media/rc/keymaps/rc-proteus-2309.c b/drivers/media/rc/keymaps/rc-proteus-2309.c index 22e92d39dee5..802c58a0ae26 100644 --- a/drivers/media/rc/keymaps/rc-proteus-2309.c +++ b/drivers/media/rc/keymaps/rc-proteus-2309.c | |||
@@ -47,7 +47,7 @@ static struct rc_keymap proteus_2309_map = { | |||
47 | .map = { | 47 | .map = { |
48 | .scan = proteus_2309, | 48 | .scan = proteus_2309, |
49 | .size = ARRAY_SIZE(proteus_2309), | 49 | .size = ARRAY_SIZE(proteus_2309), |
50 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 50 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
51 | .name = RC_MAP_PROTEUS_2309, | 51 | .name = RC_MAP_PROTEUS_2309, |
52 | } | 52 | } |
53 | }; | 53 | }; |
diff --git a/drivers/media/rc/keymaps/rc-purpletv.c b/drivers/media/rc/keymaps/rc-purpletv.c index 4e20fc2269f7..f3e9709b7c1f 100644 --- a/drivers/media/rc/keymaps/rc-purpletv.c +++ b/drivers/media/rc/keymaps/rc-purpletv.c | |||
@@ -59,7 +59,7 @@ static struct rc_keymap purpletv_map = { | |||
59 | .map = { | 59 | .map = { |
60 | .scan = purpletv, | 60 | .scan = purpletv, |
61 | .size = ARRAY_SIZE(purpletv), | 61 | .size = ARRAY_SIZE(purpletv), |
62 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 62 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
63 | .name = RC_MAP_PURPLETV, | 63 | .name = RC_MAP_PURPLETV, |
64 | } | 64 | } |
65 | }; | 65 | }; |
diff --git a/drivers/media/rc/keymaps/rc-pv951.c b/drivers/media/rc/keymaps/rc-pv951.c index 36679e706cf3..e301ff033af1 100644 --- a/drivers/media/rc/keymaps/rc-pv951.c +++ b/drivers/media/rc/keymaps/rc-pv951.c | |||
@@ -56,7 +56,7 @@ static struct rc_keymap pv951_map = { | |||
56 | .map = { | 56 | .map = { |
57 | .scan = pv951, | 57 | .scan = pv951, |
58 | .size = ARRAY_SIZE(pv951), | 58 | .size = ARRAY_SIZE(pv951), |
59 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 59 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
60 | .name = RC_MAP_PV951, | 60 | .name = RC_MAP_PV951, |
61 | } | 61 | } |
62 | }; | 62 | }; |
diff --git a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c index cc6b8f548747..91bcab8bd266 100644 --- a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c +++ b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c | |||
@@ -81,7 +81,7 @@ static struct rc_keymap rc5_hauppauge_new_map = { | |||
81 | .map = { | 81 | .map = { |
82 | .scan = rc5_hauppauge_new, | 82 | .scan = rc5_hauppauge_new, |
83 | .size = ARRAY_SIZE(rc5_hauppauge_new), | 83 | .size = ARRAY_SIZE(rc5_hauppauge_new), |
84 | .ir_type = IR_TYPE_RC5, | 84 | .rc_type = RC_TYPE_RC5, |
85 | .name = RC_MAP_RC5_HAUPPAUGE_NEW, | 85 | .name = RC_MAP_RC5_HAUPPAUGE_NEW, |
86 | } | 86 | } |
87 | }; | 87 | }; |
diff --git a/drivers/media/rc/keymaps/rc-rc5-tv.c b/drivers/media/rc/keymaps/rc-rc5-tv.c index 73cce2f8ddfb..cda2a2fae04d 100644 --- a/drivers/media/rc/keymaps/rc-rc5-tv.c +++ b/drivers/media/rc/keymaps/rc-rc5-tv.c | |||
@@ -59,7 +59,7 @@ static struct rc_keymap rc5_tv_map = { | |||
59 | .map = { | 59 | .map = { |
60 | .scan = rc5_tv, | 60 | .scan = rc5_tv, |
61 | .size = ARRAY_SIZE(rc5_tv), | 61 | .size = ARRAY_SIZE(rc5_tv), |
62 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 62 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
63 | .name = RC_MAP_RC5_TV, | 63 | .name = RC_MAP_RC5_TV, |
64 | } | 64 | } |
65 | }; | 65 | }; |
diff --git a/drivers/media/rc/keymaps/rc-rc6-mce.c b/drivers/media/rc/keymaps/rc-rc6-mce.c index 6da955dfef48..f926477a0562 100644 --- a/drivers/media/rc/keymaps/rc-rc6-mce.c +++ b/drivers/media/rc/keymaps/rc-rc6-mce.c | |||
@@ -91,7 +91,7 @@ static struct rc_keymap rc6_mce_map = { | |||
91 | .map = { | 91 | .map = { |
92 | .scan = rc6_mce, | 92 | .scan = rc6_mce, |
93 | .size = ARRAY_SIZE(rc6_mce), | 93 | .size = ARRAY_SIZE(rc6_mce), |
94 | .ir_type = IR_TYPE_RC6, | 94 | .rc_type = RC_TYPE_RC6, |
95 | .name = RC_MAP_RC6_MCE, | 95 | .name = RC_MAP_RC6_MCE, |
96 | } | 96 | } |
97 | }; | 97 | }; |
diff --git a/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c b/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c index ab1a6d2baf72..678142659183 100644 --- a/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c +++ b/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c | |||
@@ -56,7 +56,7 @@ static struct rc_keymap real_audio_220_32_keys_map = { | |||
56 | .map = { | 56 | .map = { |
57 | .scan = real_audio_220_32_keys, | 57 | .scan = real_audio_220_32_keys, |
58 | .size = ARRAY_SIZE(real_audio_220_32_keys), | 58 | .size = ARRAY_SIZE(real_audio_220_32_keys), |
59 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 59 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
60 | .name = RC_MAP_REAL_AUDIO_220_32_KEYS, | 60 | .name = RC_MAP_REAL_AUDIO_220_32_KEYS, |
61 | } | 61 | } |
62 | }; | 62 | }; |
diff --git a/drivers/media/rc/keymaps/rc-streamzap.c b/drivers/media/rc/keymaps/rc-streamzap.c index df32013a321c..bafe5b8f4192 100644 --- a/drivers/media/rc/keymaps/rc-streamzap.c +++ b/drivers/media/rc/keymaps/rc-streamzap.c | |||
@@ -60,7 +60,7 @@ static struct rc_keymap streamzap_map = { | |||
60 | .map = { | 60 | .map = { |
61 | .scan = streamzap, | 61 | .scan = streamzap, |
62 | .size = ARRAY_SIZE(streamzap), | 62 | .size = ARRAY_SIZE(streamzap), |
63 | .ir_type = IR_TYPE_RC5_SZ, | 63 | .rc_type = RC_TYPE_RC5_SZ, |
64 | .name = RC_MAP_STREAMZAP, | 64 | .name = RC_MAP_STREAMZAP, |
65 | } | 65 | } |
66 | }; | 66 | }; |
diff --git a/drivers/media/rc/keymaps/rc-tbs-nec.c b/drivers/media/rc/keymaps/rc-tbs-nec.c index 3309631e6f80..4ef4f811d011 100644 --- a/drivers/media/rc/keymaps/rc-tbs-nec.c +++ b/drivers/media/rc/keymaps/rc-tbs-nec.c | |||
@@ -51,7 +51,7 @@ static struct rc_keymap tbs_nec_map = { | |||
51 | .map = { | 51 | .map = { |
52 | .scan = tbs_nec, | 52 | .scan = tbs_nec, |
53 | .size = ARRAY_SIZE(tbs_nec), | 53 | .size = ARRAY_SIZE(tbs_nec), |
54 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 54 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
55 | .name = RC_MAP_TBS_NEC, | 55 | .name = RC_MAP_TBS_NEC, |
56 | } | 56 | } |
57 | }; | 57 | }; |
diff --git a/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c index 5326a0b444c1..4064a32569e2 100644 --- a/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c +++ b/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | |||
@@ -70,7 +70,7 @@ static struct rc_keymap terratec_cinergy_xs_map = { | |||
70 | .map = { | 70 | .map = { |
71 | .scan = terratec_cinergy_xs, | 71 | .scan = terratec_cinergy_xs, |
72 | .size = ARRAY_SIZE(terratec_cinergy_xs), | 72 | .size = ARRAY_SIZE(terratec_cinergy_xs), |
73 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 73 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
74 | .name = RC_MAP_TERRATEC_CINERGY_XS, | 74 | .name = RC_MAP_TERRATEC_CINERGY_XS, |
75 | } | 75 | } |
76 | }; | 76 | }; |
diff --git a/drivers/media/rc/keymaps/rc-terratec-slim.c b/drivers/media/rc/keymaps/rc-terratec-slim.c index 10dee4c1deff..c23caf70036b 100644 --- a/drivers/media/rc/keymaps/rc-terratec-slim.c +++ b/drivers/media/rc/keymaps/rc-terratec-slim.c | |||
@@ -57,7 +57,7 @@ static struct rc_keymap terratec_slim_map = { | |||
57 | .map = { | 57 | .map = { |
58 | .scan = terratec_slim, | 58 | .scan = terratec_slim, |
59 | .size = ARRAY_SIZE(terratec_slim), | 59 | .size = ARRAY_SIZE(terratec_slim), |
60 | .ir_type = IR_TYPE_NEC, | 60 | .rc_type = RC_TYPE_NEC, |
61 | .name = RC_MAP_TERRATEC_SLIM, | 61 | .name = RC_MAP_TERRATEC_SLIM, |
62 | } | 62 | } |
63 | }; | 63 | }; |
diff --git a/drivers/media/rc/keymaps/rc-tevii-nec.c b/drivers/media/rc/keymaps/rc-tevii-nec.c index e30d411c07bb..eabfb70973b5 100644 --- a/drivers/media/rc/keymaps/rc-tevii-nec.c +++ b/drivers/media/rc/keymaps/rc-tevii-nec.c | |||
@@ -66,7 +66,7 @@ static struct rc_keymap tevii_nec_map = { | |||
66 | .map = { | 66 | .map = { |
67 | .scan = tevii_nec, | 67 | .scan = tevii_nec, |
68 | .size = ARRAY_SIZE(tevii_nec), | 68 | .size = ARRAY_SIZE(tevii_nec), |
69 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 69 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
70 | .name = RC_MAP_TEVII_NEC, | 70 | .name = RC_MAP_TEVII_NEC, |
71 | } | 71 | } |
72 | }; | 72 | }; |
diff --git a/drivers/media/rc/keymaps/rc-total-media-in-hand.c b/drivers/media/rc/keymaps/rc-total-media-in-hand.c index fd1985763781..cd39b3dbab06 100644 --- a/drivers/media/rc/keymaps/rc-total-media-in-hand.c +++ b/drivers/media/rc/keymaps/rc-total-media-in-hand.c | |||
@@ -63,7 +63,7 @@ static struct rc_keymap total_media_in_hand_map = { | |||
63 | .map = { | 63 | .map = { |
64 | .scan = total_media_in_hand, | 64 | .scan = total_media_in_hand, |
65 | .size = ARRAY_SIZE(total_media_in_hand), | 65 | .size = ARRAY_SIZE(total_media_in_hand), |
66 | .ir_type = IR_TYPE_NEC, | 66 | .rc_type = RC_TYPE_NEC, |
67 | .name = RC_MAP_TOTAL_MEDIA_IN_HAND, | 67 | .name = RC_MAP_TOTAL_MEDIA_IN_HAND, |
68 | } | 68 | } |
69 | }; | 69 | }; |
diff --git a/drivers/media/rc/keymaps/rc-trekstor.c b/drivers/media/rc/keymaps/rc-trekstor.c index 91092caca452..31d6c6c23642 100644 --- a/drivers/media/rc/keymaps/rc-trekstor.c +++ b/drivers/media/rc/keymaps/rc-trekstor.c | |||
@@ -58,7 +58,7 @@ static struct rc_keymap trekstor_map = { | |||
58 | .map = { | 58 | .map = { |
59 | .scan = trekstor, | 59 | .scan = trekstor, |
60 | .size = ARRAY_SIZE(trekstor), | 60 | .size = ARRAY_SIZE(trekstor), |
61 | .ir_type = IR_TYPE_NEC, | 61 | .rc_type = RC_TYPE_NEC, |
62 | .name = RC_MAP_TREKSTOR, | 62 | .name = RC_MAP_TREKSTOR, |
63 | } | 63 | } |
64 | }; | 64 | }; |
diff --git a/drivers/media/rc/keymaps/rc-tt-1500.c b/drivers/media/rc/keymaps/rc-tt-1500.c index bc88de011d5d..45a060850e53 100644 --- a/drivers/media/rc/keymaps/rc-tt-1500.c +++ b/drivers/media/rc/keymaps/rc-tt-1500.c | |||
@@ -60,7 +60,7 @@ static struct rc_keymap tt_1500_map = { | |||
60 | .map = { | 60 | .map = { |
61 | .scan = tt_1500, | 61 | .scan = tt_1500, |
62 | .size = ARRAY_SIZE(tt_1500), | 62 | .size = ARRAY_SIZE(tt_1500), |
63 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 63 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
64 | .name = RC_MAP_TT_1500, | 64 | .name = RC_MAP_TT_1500, |
65 | } | 65 | } |
66 | }; | 66 | }; |
diff --git a/drivers/media/rc/keymaps/rc-twinhan1027.c b/drivers/media/rc/keymaps/rc-twinhan1027.c index 0b5d356c2d84..b5def5387ded 100644 --- a/drivers/media/rc/keymaps/rc-twinhan1027.c +++ b/drivers/media/rc/keymaps/rc-twinhan1027.c | |||
@@ -65,7 +65,7 @@ static struct rc_keymap twinhan_vp1027_map = { | |||
65 | .map = { | 65 | .map = { |
66 | .scan = twinhan_vp1027, | 66 | .scan = twinhan_vp1027, |
67 | .size = ARRAY_SIZE(twinhan_vp1027), | 67 | .size = ARRAY_SIZE(twinhan_vp1027), |
68 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 68 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
69 | .name = RC_MAP_TWINHAN_VP1027_DVBS, | 69 | .name = RC_MAP_TWINHAN_VP1027_DVBS, |
70 | } | 70 | } |
71 | }; | 71 | }; |
diff --git a/drivers/media/rc/keymaps/rc-videomate-s350.c b/drivers/media/rc/keymaps/rc-videomate-s350.c index 4df7fcd1d2fc..7c422b4670fa 100644 --- a/drivers/media/rc/keymaps/rc-videomate-s350.c +++ b/drivers/media/rc/keymaps/rc-videomate-s350.c | |||
@@ -63,7 +63,7 @@ static struct rc_keymap videomate_s350_map = { | |||
63 | .map = { | 63 | .map = { |
64 | .scan = videomate_s350, | 64 | .scan = videomate_s350, |
65 | .size = ARRAY_SIZE(videomate_s350), | 65 | .size = ARRAY_SIZE(videomate_s350), |
66 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 66 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
67 | .name = RC_MAP_VIDEOMATE_S350, | 67 | .name = RC_MAP_VIDEOMATE_S350, |
68 | } | 68 | } |
69 | }; | 69 | }; |
diff --git a/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c b/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c index 776b0a638d87..4d31b47dfc30 100644 --- a/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c +++ b/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | |||
@@ -65,7 +65,7 @@ static struct rc_keymap videomate_tv_pvr_map = { | |||
65 | .map = { | 65 | .map = { |
66 | .scan = videomate_tv_pvr, | 66 | .scan = videomate_tv_pvr, |
67 | .size = ARRAY_SIZE(videomate_tv_pvr), | 67 | .size = ARRAY_SIZE(videomate_tv_pvr), |
68 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 68 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
69 | .name = RC_MAP_VIDEOMATE_TV_PVR, | 69 | .name = RC_MAP_VIDEOMATE_TV_PVR, |
70 | } | 70 | } |
71 | }; | 71 | }; |
diff --git a/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c b/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c index 9d2d550aaa90..ade3c14c4c0f 100644 --- a/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c +++ b/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | |||
@@ -60,7 +60,7 @@ static struct rc_keymap winfast_usbii_deluxe_map = { | |||
60 | .map = { | 60 | .map = { |
61 | .scan = winfast_usbii_deluxe, | 61 | .scan = winfast_usbii_deluxe, |
62 | .size = ARRAY_SIZE(winfast_usbii_deluxe), | 62 | .size = ARRAY_SIZE(winfast_usbii_deluxe), |
63 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 63 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
64 | .name = RC_MAP_WINFAST_USBII_DELUXE, | 64 | .name = RC_MAP_WINFAST_USBII_DELUXE, |
65 | } | 65 | } |
66 | }; | 66 | }; |
diff --git a/drivers/media/rc/keymaps/rc-winfast.c b/drivers/media/rc/keymaps/rc-winfast.c index 0e90a3bd9499..502b5f54f84e 100644 --- a/drivers/media/rc/keymaps/rc-winfast.c +++ b/drivers/media/rc/keymaps/rc-winfast.c | |||
@@ -80,7 +80,7 @@ static struct rc_keymap winfast_map = { | |||
80 | .map = { | 80 | .map = { |
81 | .scan = winfast, | 81 | .scan = winfast, |
82 | .size = ARRAY_SIZE(winfast), | 82 | .size = ARRAY_SIZE(winfast), |
83 | .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ | 83 | .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ |
84 | .name = RC_MAP_WINFAST, | 84 | .name = RC_MAP_WINFAST, |
85 | } | 85 | } |
86 | }; | 86 | }; |