Commit 7dc2df14 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

[media] rc: lirc keymap no longer makes any sense 



The lirc keymap existed once upon a time to select the lirc protocol.
Since '275ddb40 [media] rc-core: remove the LIRC "protocol"', IR is
always passed to the lirc decoder so this keymap is no longer needed.

Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ee5310e6

drivers/media/rc/keymaps/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ 
			rc-kworld-pc150u.o \

			rc-kworld-plus-tv-analog.o \

			rc-leadtek-y04g0051.o \

			rc-lirc.o \

			rc-lme2510.o \

			rc-manli.o \

			rc-medion-x10.o \

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

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/* rc-lirc.c - Empty dummy keytable, for use when its preferred to pass

 * all raw IR data to the lirc userspace decoder.

 *

 * Copyright (c) 2010 by Jarod Wilson <jarod@redhat.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include <media/rc-core.h>

#include <linux/module.h>



static struct rc_map_table lirc[] = {

	{ },

};



static struct rc_map_list lirc_map = {

	.map = {

		.scan    = lirc,

		.size    = ARRAY_SIZE(lirc),

		.rc_type = RC_TYPE_OTHER,

		.name    = RC_MAP_LIRC,

	}

};



static int __init init_rc_map_lirc(void)

{

	return rc_map_register(&lirc_map);

}



static void __exit exit_rc_map_lirc(void)

{

	rc_map_unregister(&lirc_map);

}



module_init(init_rc_map_lirc)

module_exit(exit_rc_map_lirc)



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");

drivers/media/rc/st_rc.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int st_rc_probe(struct platform_device *pdev) 
	rdev->open = st_rc_open;

	rdev->close = st_rc_close;

	rdev->driver_name = IR_ST_NAME;

	rdev->map_name = RC_MAP_LIRC;

	rdev->map_name = RC_MAP_EMPTY;

	rdev->input_name = "ST Remote Control Receiver";



	ret = rc_register_device(rdev);

include/media/rc-map.h

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ struct rc_map *rc_map_get(const char *name); 
#define RC_MAP_KWORLD_PC150U             "rc-kworld-pc150u"

#define RC_MAP_KWORLD_PLUS_TV_ANALOG     "rc-kworld-plus-tv-analog"

#define RC_MAP_LEADTEK_Y04G0051          "rc-leadtek-y04g0051"

#define RC_MAP_LIRC                      "rc-lirc"

#define RC_MAP_LME2510                   "rc-lme2510"

#define RC_MAP_MANLI                     "rc-manli"

#define RC_MAP_MEDION_X10                "rc-medion-x10"

CRA Git | Maintained and supported by SUSTech CRA and CCSE