V4L/DVB: standardize names at rc-dib0700 tables

Use a more standard way to name those tables, as they're currently used
by the script that coverts those tables to be loaded via userspace.

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

diff --git a/drivers/media/IR/keymaps/rc-dib0700-nec.c b/drivers/media/IR/keymaps/rc-dib0700-nec.c
index f5809f4757f91a51183daade210563b44fd8362a..ae1832038fbe2300edf88056cebcef97ac1ac6a6 100644 (file)
--- a/drivers/media/IR/keymaps/rc-dib0700-nec.c
+++ b/drivers/media/IR/keymaps/rc-dib0700-nec.c
@@ -17,7 +17,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode dib0700_table[] = {
+static struct ir_scancode dib0700_nec_table[] = {
        /* Key codes for the Pixelview SBTVD remote */
        { 0x8613, KEY_MUTE },
        { 0x8612, KEY_POWER },
@@ -98,10 +98,10 @@ static struct ir_scancode dib0700_table[] = {
        { 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */
 };
 
-static struct rc_keymap dib0700_map = {
+static struct rc_keymap dib0700_nec_map = {
        .map = {
-               .scan    = dib0700_table,
-               .size    = ARRAY_SIZE(dib0700_table),
+               .scan    = dib0700_nec_table,
+               .size    = ARRAY_SIZE(dib0700_nec_table),
                .ir_type = IR_TYPE_NEC,
                .name    = RC_MAP_DIB0700_NEC_TABLE,
        }
@@ -109,12 +109,12 @@ static struct rc_keymap dib0700_map = {
 
 static int __init init_rc_map(void)
 {
-       return ir_register_map(&dib0700_map);
+       return ir_register_map(&dib0700_nec_map);
 }
 
 static void __exit exit_rc_map(void)
 {
-       ir_unregister_map(&dib0700_map);
+       ir_unregister_map(&dib0700_nec_map);
 }
 
 module_init(init_rc_map)

diff --git a/drivers/media/IR/keymaps/rc-dib0700-rc5.c b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
index e2d0fd2bbaf9cec510c1a675b2963a89a7a0b1c9..4a4797cfd77d7a66f64114f7a61e8539296ed23b 100644 (file)
--- a/drivers/media/IR/keymaps/rc-dib0700-rc5.c
+++ b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
@@ -17,7 +17,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode dib0700_table[] = {
+static struct ir_scancode dib0700_rc5_table[] = {
        /* Key codes for the tiny Pinnacle remote*/
        { 0x0700, KEY_MUTE },
        { 0x0701, KEY_MENU }, /* Pinnacle logo */
@@ -209,10 +209,10 @@ static struct ir_scancode dib0700_table[] = {
        { 0x1d3d, KEY_POWER },
 };
 
-static struct rc_keymap dib0700_map = {
+static struct rc_keymap dib0700_rc5_map = {
        .map = {
-               .scan    = dib0700_table,
-               .size    = ARRAY_SIZE(dib0700_table),
+               .scan    = dib0700_rc5_table,
+               .size    = ARRAY_SIZE(dib0700_rc5_table),
                .ir_type = IR_TYPE_RC5,
                .name    = RC_MAP_DIB0700_RC5_TABLE,
        }
@@ -220,12 +220,12 @@ static struct rc_keymap dib0700_map = {
 
 static int __init init_rc_map(void)
 {
-       return ir_register_map(&dib0700_map);
+       return ir_register_map(&dib0700_rc5_map);
 }
 
 static void __exit exit_rc_map(void)
 {
-       ir_unregister_map(&dib0700_map);
+       ir_unregister_map(&dib0700_rc5_map);
 }
 
 module_init(init_rc_map)