Commit d100e659 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] rc: use rc_map_ prefix for all rc map tables 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2f4f58d6

drivers/media/dvb/mantis/mantis_input.c

+4 −4
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static struct rc_map_table mantis_ir_table[] = { 
	{ 0x00, KEY_BLUE	},

};



static struct rc_keymap ir_mantis_map = {

static struct rc_map_list ir_mantis_map = {

	.map = {

		.scan = mantis_ir_table,

		.size = ARRAY_SIZE(mantis_ir_table),
@@ -109,7 +109,7 @@ int mantis_input_init(struct mantis_pci *mantis) 
	struct rc_dev *dev;

	int err;



	err = ir_register_map(&ir_mantis_map);

	err = rc_map_register(&ir_mantis_map);

	if (err)

		goto out;
@@ -145,7 +145,7 @@ int mantis_input_init(struct mantis_pci *mantis) 
out_dev:

	rc_free_device(dev);

out_map:

	ir_unregister_map(&ir_mantis_map);

	rc_map_unregister(&ir_mantis_map);

out:

	return err;

}
@@ -153,7 +153,7 @@ int mantis_input_init(struct mantis_pci *mantis) 
int mantis_exit(struct mantis_pci *mantis)

{

	rc_unregister_device(mantis->rc);

	ir_unregister_map(&ir_mantis_map);

	rc_map_unregister(&ir_mantis_map);

	return 0;

}

drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static struct rc_map_table adstech_dvb_t_pci[] = { 
	{ 0x1c, KEY_VOLUMEDOWN },

};



static struct rc_keymap adstech_dvb_t_pci_map = {

static struct rc_map_list adstech_dvb_t_pci_map = {

	.map = {

		.scan    = adstech_dvb_t_pci,

		.size    = ARRAY_SIZE(adstech_dvb_t_pci),
@@ -74,12 +74,12 @@ static struct rc_keymap adstech_dvb_t_pci_map = { 


static int __init init_rc_map_adstech_dvb_t_pci(void)

{

	return ir_register_map(&adstech_dvb_t_pci_map);

	return rc_map_register(&adstech_dvb_t_pci_map);

}



static void __exit exit_rc_map_adstech_dvb_t_pci(void)

{

	ir_unregister_map(&adstech_dvb_t_pci_map);

	rc_map_unregister(&adstech_dvb_t_pci_map);

}



module_init(init_rc_map_adstech_dvb_t_pci)

drivers/media/rc/keymaps/rc-alink-dtu-m.c

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static struct rc_map_table alink_dtu_m[] = { 
	{ 0x081d, KEY_CHANNELDOWN },

};



static struct rc_keymap alink_dtu_m_map = {

static struct rc_map_list alink_dtu_m_map = {

	.map = {

		.scan    = alink_dtu_m,

		.size    = ARRAY_SIZE(alink_dtu_m),
@@ -53,12 +53,12 @@ static struct rc_keymap alink_dtu_m_map = { 


static int __init init_rc_map_alink_dtu_m(void)

{

	return ir_register_map(&alink_dtu_m_map);

	return rc_map_register(&alink_dtu_m_map);

}



static void __exit exit_rc_map_alink_dtu_m(void)

{

	ir_unregister_map(&alink_dtu_m_map);

	rc_map_unregister(&alink_dtu_m_map);

}



module_init(init_rc_map_alink_dtu_m)

drivers/media/rc/keymaps/rc-anysee.c

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static struct rc_map_table anysee[] = { 
	{ 0x0851, KEY_PAUSE },

};



static struct rc_keymap anysee_map = {

static struct rc_map_list anysee_map = {

	.map = {

		.scan    = anysee,

		.size    = ARRAY_SIZE(anysee),
@@ -78,12 +78,12 @@ static struct rc_keymap anysee_map = { 


static int __init init_rc_map_anysee(void)

{

	return ir_register_map(&anysee_map);

	return rc_map_register(&anysee_map);

}



static void __exit exit_rc_map_anysee(void)

{

	ir_unregister_map(&anysee_map);

	rc_map_unregister(&anysee_map);

}



module_init(init_rc_map_anysee)

drivers/media/rc/keymaps/rc-apac-viewcomp.c

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static struct rc_map_table apac_viewcomp[] = { 
	{ 0x18, KEY_KPMINUS },		/* fine tune <<<< */

};



static struct rc_keymap apac_viewcomp_map = {

static struct rc_map_list apac_viewcomp_map = {

	.map = {

		.scan    = apac_viewcomp,

		.size    = ARRAY_SIZE(apac_viewcomp),
@@ -65,12 +65,12 @@ static struct rc_keymap apac_viewcomp_map = { 


static int __init init_rc_map_apac_viewcomp(void)

{

	return ir_register_map(&apac_viewcomp_map);

	return rc_map_register(&apac_viewcomp_map);

}



static void __exit exit_rc_map_apac_viewcomp(void)

{

	ir_unregister_map(&apac_viewcomp_map);

	rc_map_unregister(&apac_viewcomp_map);

}



module_init(init_rc_map_apac_viewcomp)