Skip to content

Commit 3b425dd

Browse files
committed
parisc: led: Move register_led_regions() to late_initcall()
Signed-off-by: Helge Deller <[email protected]>
1 parent df3f935 commit 3b425dd

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

arch/parisc/include/asm/led.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
/* register_led_driver() */
2828
int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long data_reg);
2929

30-
/* registers the LED regions for procfs */
31-
void __init register_led_regions(void);
32-
3330
#ifdef CONFIG_CHASSIS_LCD_LED
3431
/* writes a string to the LCD display (if possible on this h/w) */
3532
int lcd_print(const char *str);

arch/parisc/kernel/setup.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,6 @@ static int __init parisc_init(void)
286286
#if defined(CONFIG_IOMMU_SBA)
287287
sba_init();
288288
#endif
289-
290-
#ifdef CONFIG_CHASSIS_LCD_LED
291-
register_led_regions(); /* register LED port info in procfs */
292-
#endif
293-
294289
return 0;
295290
}
296291
arch_initcall(parisc_init);

drivers/parisc/led.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d
613613
**
614614
*/
615615

616-
void __init register_led_regions(void)
616+
static int __init register_led_regions(void)
617617
{
618618
switch (lcd_info.model) {
619619
case DISPLAY_MODEL_LCD:
@@ -625,7 +625,9 @@ void __init register_led_regions(void)
625625
request_mem_region((unsigned long)LED_DATA_REG, 1, "led_data");
626626
break;
627627
}
628+
return 0;
628629
}
630+
late_initcall(register_led_regions);
629631

630632

631633
/*

0 commit comments

Comments
 (0)