2 files changed, 13 insertions, 27 deletions

diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index 81c936bd793f..4be075780ad0 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -129,14 +129,6 @@ static inline bool is_timing_event(struct ir_raw_event ev)
 
 #define TO_US(duration)                 DIV_ROUND_CLOSEST((duration), 1000)
 #define TO_STR(is_pulse)                ((is_pulse) ? "pulse" : "space")
-/*
- * Routines from ir-sysfs.c - Meant to be called only internally inside
- * ir-core
- */
-int ir_register_input(struct input_dev *input_dev);
-
-int ir_register_class(struct input_dev *input_dev);
-void ir_unregister_class(struct input_dev *input_dev);
 
 /*
  * Routines from ir-raw-event.c to be used internally and by decoders
@@ -148,8 +140,6 @@ int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler);
 void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler);
 void ir_raw_init(void);
 
-int ir_rcmap_init(void);
-void ir_rcmap_cleanup(void);
 /*
  * Decoder initialization code
  *
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index afcf0a88464d..67a6bd5d9497 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -32,10 +32,16 @@ static unsigned long ir_core_dev_number;
 /* FIXME: IR_KEYPRESS_TIMEOUT should be protocol specific */
 #define IR_KEYPRESS_TIMEOUT 250
 
-/* Used to handle IR raw handler extensions */
+/* Used to keep track of known keymaps */
 static LIST_HEAD(rc_map_list);
 static DEFINE_SPINLOCK(rc_map_lock);
 
+/* Forward declarations */
+static int ir_register_class(struct input_dev *input_dev);
+static void ir_unregister_class(struct input_dev *input_dev);
+static int ir_register_input(struct input_dev *input_dev);
+
+
 static struct rc_keymap *seek_rc_map(const char *name)
 {
         struct rc_keymap *map = NULL;
@@ -112,16 +118,6 @@ static struct rc_keymap empty_map = {
         }
 };
 
-int ir_rcmap_init(void)
-{
-        return ir_register_map(&empty_map);
-}
-
-void ir_rcmap_cleanup(void)
-{
-        ir_unregister_map(&empty_map);
-}
-
 /**
  * ir_create_table() - initializes a scancode table
  * @rc_tab:     the ir_scancode_table to initialize
@@ -265,7 +261,7 @@ static unsigned int ir_update_mapping(struct input_dev *dev,
 }
 
 /**
- * ir_locate_scancode() - set a keycode in the scancode->keycode table
+ * ir_establish_scancode() - set a keycode in the scancode->keycode table
  * @ir_dev:     the struct ir_input_dev device descriptor
  * @rc_tab:     scancode table to be searched
  * @scancode:   the desired scancode
@@ -1097,7 +1093,7 @@ static struct device_type rc_dev_type = {
  *
  * This routine is used to register the syfs code for IR class
  */
-int ir_register_class(struct input_dev *input_dev)
+static int ir_register_class(struct input_dev *input_dev)
 {
         struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
         int devno = find_first_zero_bit(&ir_core_dev_number,
@@ -1122,7 +1118,7 @@ int ir_register_class(struct input_dev *input_dev)
  * @input_dev:  the struct input_dev descriptor of the device
  */
 
-int ir_register_input(struct input_dev *input_dev)
+static int ir_register_input(struct input_dev *input_dev)
 {
         struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
         int rc;
@@ -1155,7 +1151,7 @@ int ir_register_input(struct input_dev *input_dev)
  *
  * This routine is used to unregister the syfs code for IR class
  */
-void ir_unregister_class(struct input_dev *input_dev)
+static void ir_unregister_class(struct input_dev *input_dev)
 {
         struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
 
@@ -1181,7 +1177,7 @@ static int __init ir_core_init(void)
 
         /* Initialize/load the decoders/keymap code that will be used */
         ir_raw_init();
-        ir_rcmap_init();
+        ir_register_map(&empty_map);
 
         return 0;
 }
@@ -1189,7 +1185,7 @@ static int __init ir_core_init(void)
 static void __exit ir_core_exit(void)
 {
         class_unregister(&ir_input_class);
-        ir_rcmap_cleanup();
+        ir_unregister_map(&empty_map);
 }
 
 module_init(ir_core_init);