parisc: led: Move register_led_regions() to late_initcall()

Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/arch/parisc/include/asm/led.h b/arch/parisc/include/asm/led.h
index 6de13d0..d1a016e 100644 (file)
--- a/arch/parisc/include/asm/led.h
+++ b/arch/parisc/include/asm/led.h
@@ -27,9 +27,6 @@
 /* register_led_driver() */
 int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long data_reg);
 
-/* registers the LED regions for procfs */
-void __init register_led_regions(void);
-
 #ifdef CONFIG_CHASSIS_LCD_LED
 /* writes a string to the LCD display (if possible on this h/w) */
 int lcd_print(const char *str);

diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 3b8ba55..ef642a2 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -286,11 +286,6 @@ static int __init parisc_init(void)
 #if defined(CONFIG_IOMMU_SBA)
        sba_init();
 #endif
-
-#ifdef CONFIG_CHASSIS_LCD_LED
-       register_led_regions(); /* register LED port info in procfs */
-#endif
-
        return 0;
 }
 arch_initcall(parisc_init);

diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 3737c10..38cd145 100644 (file)
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -613,7 +613,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d
    **
  */
 
-void __init register_led_regions(void)
+static int __init register_led_regions(void)
 {
        switch (lcd_info.model) {
        case DISPLAY_MODEL_LCD:
@@ -625,7 +625,9 @@ void __init register_led_regions(void)
                request_mem_region((unsigned long)LED_DATA_REG, 1, "led_data");
                break;
        }
+       return 0;
 }
+late_initcall(register_led_regions);
 
 
 /*