Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

+3 -9
-3
arch/parisc/include/asm/led.h
··· 27 27 /* register_led_driver() */ 28 28 int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long data_reg); 29 29 30 - /* registers the LED regions for procfs */ 31 - void __init register_led_regions(void); 32 - 33 30 #ifdef CONFIG_CHASSIS_LCD_LED 34 31 /* writes a string to the LCD display (if possible on this h/w) */ 35 32 int lcd_print(const char *str);
-5
arch/parisc/kernel/setup.c
··· 286 286 #if defined(CONFIG_IOMMU_SBA) 287 287 sba_init(); 288 288 #endif 289 - 290 - #ifdef CONFIG_CHASSIS_LCD_LED 291 - register_led_regions(); /* register LED port info in procfs */ 292 - #endif 293 - 294 289 return 0; 295 290 } 296 291 arch_initcall(parisc_init);
+3 -1
drivers/parisc/led.c
··· 613 613 ** 614 614 */ 615 615 616 - void __init register_led_regions(void) 616 + static int __init register_led_regions(void) 617 617 { 618 618 switch (lcd_info.model) { 619 619 case DISPLAY_MODEL_LCD: ··· 625 625 request_mem_region((unsigned long)LED_DATA_REG, 1, "led_data"); 626 626 break; 627 627 } 628 + return 0; 628 629 } 630 + late_initcall(register_led_regions); 629 631 630 632 631 633 /*