diff options
| author | Helge Deller <deller@gmx.de> | 2023-08-27 09:36:23 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2023-08-27 09:36:23 +0200 |
| commit | 3b425dd2aeb8c876805a4cc29d84a6c455b43530 (patch) | |
| tree | 5ce7be73128999e5e8f74213c2b4a1d52ce2b8af | |
| parent | df3f93596c8ffb97482bb6d90f4933d7417605aa (diff) | |
| download | lwn-3b425dd2aeb8c876805a4cc29d84a6c455b43530.tar.gz lwn-3b425dd2aeb8c876805a4cc29d84a6c455b43530.zip | |
parisc: led: Move register_led_regions() to late_initcall()
Signed-off-by: Helge Deller <deller@gmx.de>
| -rw-r--r-- | arch/parisc/include/asm/led.h | 3 | ||||
| -rw-r--r-- | arch/parisc/kernel/setup.c | 5 | ||||
| -rw-r--r-- | drivers/parisc/led.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/arch/parisc/include/asm/led.h b/arch/parisc/include/asm/led.h index 6de13d08a388..d1a016e33198 100644 --- 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 3b8ba550f029..ef642a2ade96 100644 --- 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 3737c1021f88..38cd14530ff2 100644 --- 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); /* |