From a4ec9631380abf8ffdc4385e38dc386858df846a Mon Sep 17 00:00:00 2001 From: Benjamin Walsh Date: Thu, 28 Jan 2016 15:16:31 -0500 Subject: [PATCH] init: use SYS_INIT() where it makes sense Mostly SoC initialization and some kernel subsystems, but also some device drivers like the interrupt controllers. Change-Id: I8dc1844c33acd877c075b6b03558fdca6f87500b Signed-off-by: Benjamin Walsh --- arch/arc/soc/quark_se_ss/soc.c | 5 ++--- arch/arc/soc/quark_se_ss/soc_config.c | 4 +--- arch/arm/soc/atmel_sam3/soc.c | 4 +--- arch/arm/soc/fsl_frdm_k64f/soc.c | 4 +--- arch/arm/soc/fsl_frdm_k64f/soc_config.c | 4 +--- arch/arm/soc/ti_lm3s6965/soc.c | 4 +--- arch/arm/soc/ti_lm3s6965/soc_config.c | 4 +--- arch/x86/core/cache.c | 4 +--- arch/x86/soc/quark_d2000/soc.c | 8 ++------ arch/x86/soc/quark_se/soc.c | 8 ++------ arch/x86/soc/quark_x1000/soc.c | 5 ++--- drivers/bluetooth/h4.c | 4 +--- drivers/bluetooth/h5.c | 4 +--- drivers/console/ram_console.c | 5 +---- drivers/console/uart_console.c | 3 +-- drivers/interrupt_controller/i8259.c | 4 +--- drivers/interrupt_controller/ioapic_intr.c | 4 +--- drivers/interrupt_controller/loapic_intr.c | 4 +--- drivers/timer/sys_clock_init.c | 4 +--- kernel/nanokernel/kernel_event_logger.c | 5 ++--- misc/debug/mem_safe_check_boundaries.c | 4 +--- 21 files changed, 26 insertions(+), 69 deletions(-) diff --git a/arch/arc/soc/quark_se_ss/soc.c b/arch/arc/soc/quark_se_ss/soc.c index 763a6b228ce..85d02b0f4b9 100644 --- a/arch/arc/soc/quark_se_ss/soc.c +++ b/arch/arc/soc/quark_se_ss/soc.c @@ -48,6 +48,5 @@ static int quark_se_arc_init(struct device *arg) shared_data->flags |= ARC_READY; return 0; } -DEVICE_INIT(quark_se_arc_0, "", quark_se_arc_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); + +SYS_INIT(quark_se_arc_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); diff --git a/arch/arc/soc/quark_se_ss/soc_config.c b/arch/arc/soc/quark_se_ss/soc_config.c index cf1ff05c094..aadc3721072 100644 --- a/arch/arc/soc/quark_se_ss/soc_config.c +++ b/arch/arc/soc/quark_se_ss/soc_config.c @@ -71,8 +71,6 @@ static int uart_ns16550_init(struct device *dev) return DEV_OK; } -DEVICE_INIT(uart_ns16550_init, "", uart_ns16550_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(uart_ns16550_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); #endif /* CONFIG_UART_NS16550 */ diff --git a/arch/arm/soc/atmel_sam3/soc.c b/arch/arm/soc/atmel_sam3/soc.c index 627f30911f9..6e50f4c4aa4 100644 --- a/arch/arm/soc/atmel_sam3/soc.c +++ b/arch/arm/soc/atmel_sam3/soc.c @@ -194,6 +194,4 @@ static int atmel_sam3_init(struct device *arg) return 0; } -DEVICE_INIT(atmel_sam3_0, "", atmel_sam3_init, - NULL, NULL, - PRIMARY, 0); +DEVICE_INIT(atmel_sam3_init, PRIMARY, 0); diff --git a/arch/arm/soc/fsl_frdm_k64f/soc.c b/arch/arm/soc/fsl_frdm_k64f/soc.c index 2dcb3a0d94b..efea6c517b8 100644 --- a/arch/arm/soc/fsl_frdm_k64f/soc.c +++ b/arch/arm/soc/fsl_frdm_k64f/soc.c @@ -320,6 +320,4 @@ static int fsl_frdm_k64f_init(struct device *arg) return 0; } -DEVICE_INIT(fsl_frdm_0, "", fsl_frdm_k64f_init, - NULL, NULL, - PRIMARY, 0); +SYS_INIT(fsl_frdm_k64f_init, PRIMARY, 0); diff --git a/arch/arm/soc/fsl_frdm_k64f/soc_config.c b/arch/arm/soc/fsl_frdm_k64f/soc_config.c index c1f4febb274..e2fde61de30 100644 --- a/arch/arm/soc/fsl_frdm_k64f/soc_config.c +++ b/arch/arm/soc/fsl_frdm_k64f/soc_config.c @@ -71,9 +71,7 @@ static int uart_k20_console_init(struct device *dev) return DEV_OK; } -DEVICE_INIT(_uart_k20_console, "", uart_k20_console_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(uart_k20_console_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); #endif #endif /* CONFIG_UART_CONSOLE */ diff --git a/arch/arm/soc/ti_lm3s6965/soc.c b/arch/arm/soc/ti_lm3s6965/soc.c index 70f9db9dc9a..5a6fa2d1b89 100644 --- a/arch/arm/soc/ti_lm3s6965/soc.c +++ b/arch/arm/soc/ti_lm3s6965/soc.c @@ -56,6 +56,4 @@ static int ti_lm3s6965_init(struct device *arg) return 0; } -DEVICE_INIT(ti_lm3_0, "", ti_lm3s6965_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(ti_lm3s6965_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); diff --git a/arch/arm/soc/ti_lm3s6965/soc_config.c b/arch/arm/soc/ti_lm3s6965/soc_config.c index c6fd2b02f35..a80c4b012b3 100644 --- a/arch/arm/soc/ti_lm3s6965/soc_config.c +++ b/arch/arm/soc/ti_lm3s6965/soc_config.c @@ -51,8 +51,6 @@ static int uart_stellaris_init(struct device *dev) return DEV_OK; } -DEVICE_INIT(_uart_stellaris_en, "", uart_stellaris_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); +SYS_INIT(uart_stellaris_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); #endif /* CONFIG_UART_STELLARIS */ diff --git a/arch/x86/core/cache.c b/arch/x86/core/cache.c index d0bf5dfac13..5bd0392d5cf 100644 --- a/arch/x86/core/cache.c +++ b/arch/x86/core/cache.c @@ -107,8 +107,6 @@ static int init_cache(struct device *unused) return 0; } -DEVICE_INIT(cache, "", init_cache, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(init_cache, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); #endif /* CONFIG_CLFLUSH_DETECT || CONFIG_CACHE_LINE_SIZE_DETECT */ diff --git a/arch/x86/soc/quark_d2000/soc.c b/arch/x86/soc/quark_d2000/soc.c index 06080443093..11601db163f 100644 --- a/arch/x86/soc/quark_d2000/soc.c +++ b/arch/x86/soc/quark_d2000/soc.c @@ -62,12 +62,8 @@ static int quark_d2000_init(struct device *arg) return 0; } -DEVICE_INIT(quark_d2000_0, "", quark_d2000_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(quark_d2000_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); #ifdef CONFIG_MVIC -DEVICE_INIT(mvic_0, "", _mvic_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(_mvic_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); #endif /* CONFIG_IOAPIC */ diff --git a/arch/x86/soc/quark_se/soc.c b/arch/x86/soc/quark_se/soc.c index 0e781f07c4f..b168987c826 100644 --- a/arch/x86/soc/quark_se/soc.c +++ b/arch/x86/soc/quark_se/soc.c @@ -86,9 +86,7 @@ static int arc_init(struct device *arg) return DEV_OK; } -DEVICE_INIT(quark_se_ss_0, "", arc_init, - NULL, NULL, - SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(arc_init, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); #endif /*CONFIG_ARC_INIT*/ @@ -110,9 +108,7 @@ static int platform_uart_init(struct device *arg) return DEV_OK; } -DEVICE_INIT(platform_uart_init, "", platform_uart_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(platform_uart_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ #endif /* CONFIG_UART_NS16550 */ diff --git a/arch/x86/soc/quark_x1000/soc.c b/arch/x86/soc/quark_x1000/soc.c index 71852e66563..22c9eb4b033 100644 --- a/arch/x86/soc/quark_x1000/soc.c +++ b/arch/x86/soc/quark_x1000/soc.c @@ -67,7 +67,6 @@ static int pci_legacy_bridge_irq_config(struct device *unused) return 0; } -DEVICE_INIT(pci_legacy_bridge_0, "", pci_legacy_bridge_irq_config, - NULL, NULL, - SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); +SYS_INIT(pci_legacy_bridge_irq_config, + SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); #endif /* CONFIG_PCI_LEGACY_BRIDGE */ diff --git a/drivers/bluetooth/h4.c b/drivers/bluetooth/h4.c index 11faa01ef30..3da097745b2 100644 --- a/drivers/bluetooth/h4.c +++ b/drivers/bluetooth/h4.c @@ -259,6 +259,4 @@ static int _bt_uart_init(struct device *unused) return DEV_OK; } -DEVICE_INIT(bt_uart, "", _bt_uart_init, - NULL, NULL, - NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); +SYS_INIT(_bt_uart_init, NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); diff --git a/drivers/bluetooth/h5.c b/drivers/bluetooth/h5.c index ea4c3e90fb7..12d723ff2b3 100644 --- a/drivers/bluetooth/h5.c +++ b/drivers/bluetooth/h5.c @@ -790,6 +790,4 @@ static int _bt_uart_init(struct device *unused) return DEV_OK; } -DEVICE_INIT(bt_uart, "", _bt_uart_init, - NULL, NULL, - NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); +SYS_INIT(_bt_uart_init, NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); diff --git a/drivers/console/ram_console.c b/drivers/console/ram_console.c index ad4e0bfd9ea..b7a61a1f8ae 100644 --- a/drivers/console/ram_console.c +++ b/drivers/console/ram_console.c @@ -45,7 +45,4 @@ static int ram_console_init(struct device *d) return DEV_OK; } -DEVICE_INIT(ram_console, "", ram_console_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); - +SYS_INIT(ram_console_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c index 7b67de1d9d4..a158b86d238 100644 --- a/drivers/console/uart_console.c +++ b/drivers/console/uart_console.c @@ -431,8 +431,7 @@ static int uart_console_init(struct device *arg) } /* UART consloe initializes after the UART device itself */ -DEVICE_INIT(uart_console, "", uart_console_init, - NULL, NULL, +SYS_INIT(uart_console_init, #if defined(CONFIG_EARLY_CONSOLE) PRIMARY, #else diff --git a/drivers/interrupt_controller/i8259.c b/drivers/interrupt_controller/i8259.c index 15bd18b48ee..f0860044d15 100644 --- a/drivers/interrupt_controller/i8259.c +++ b/drivers/interrupt_controller/i8259.c @@ -62,6 +62,4 @@ int _i8259_init(struct device *unused) return 0; } -DEVICE_INIT(pic_0, "", _i8259_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(_i8259_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); diff --git a/drivers/interrupt_controller/ioapic_intr.c b/drivers/interrupt_controller/ioapic_intr.c index 47a8fdf01f0..6499bb62b83 100644 --- a/drivers/interrupt_controller/ioapic_intr.c +++ b/drivers/interrupt_controller/ioapic_intr.c @@ -314,6 +314,4 @@ static void _IoApicRedUpdateLo(unsigned int irq, ioApicRedSetLo(irq, (ioApicRedGetLo(irq) & ~mask) | (value & mask)); } -DEVICE_INIT(ioapic_0, "", _ioapic_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(_ioapic_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); diff --git a/drivers/interrupt_controller/loapic_intr.c b/drivers/interrupt_controller/loapic_intr.c index f5b4bd0ff93..53c8522f097 100644 --- a/drivers/interrupt_controller/loapic_intr.c +++ b/drivers/interrupt_controller/loapic_intr.c @@ -444,9 +444,7 @@ int _loapic_isr_vector_get(void) return 0; } -DEVICE_INIT(loapic_0, "", _loapic_init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(_loapic_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); #if CONFIG_LOAPIC_SPURIOUS_VECTOR extern void _loapic_spurious_handler(void); diff --git a/drivers/timer/sys_clock_init.c b/drivers/timer/sys_clock_init.c index 4703da29ed4..4ab54888879 100644 --- a/drivers/timer/sys_clock_init.c +++ b/drivers/timer/sys_clock_init.c @@ -32,6 +32,4 @@ #include #include -DEVICE_INIT(sys_clock, "sys_clock", _sys_clock_driver_init, - NULL, NULL, - NANOKERNEL, CONFIG_SYSTEM_CLOCK_INIT_PRIORITY); +SYS_INIT(_sys_clock_driver_init, NANOKERNEL, CONFIG_SYSTEM_CLOCK_INIT_PRIORITY); diff --git a/kernel/nanokernel/kernel_event_logger.c b/kernel/nanokernel/kernel_event_logger.c index 4c66744d8e0..0439e4e703d 100644 --- a/kernel/nanokernel/kernel_event_logger.c +++ b/kernel/nanokernel/kernel_event_logger.c @@ -53,9 +53,8 @@ static int _sys_k_event_logger_init(struct device *arg) return 0; } -DEVICE_INIT(kernel_event_logger_0, "", _sys_k_event_logger_init, - NULL, NULL, - NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(_sys_k_event_logger_init, + NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); void sys_k_event_logger_put_timed(uint16_t event_id) diff --git a/misc/debug/mem_safe_check_boundaries.c b/misc/debug/mem_safe_check_boundaries.c index 0615eed9fad..962356ef9d8 100644 --- a/misc/debug/mem_safe_check_boundaries.c +++ b/misc/debug/mem_safe_check_boundaries.c @@ -290,6 +290,4 @@ static int init(struct device *unused) return 0; } -DEVICE_INIT(mem_safe, "", init, - NULL, NULL, - PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); +SYS_INIT(init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);