From c48418f2bd0d4c8d6ed515f14e67dd74e57cd2e1 Mon Sep 17 00:00:00 2001 From: Dirk Brandewie Date: Fri, 25 Sep 2015 13:02:12 -0700 Subject: [PATCH] init: remove pure_init macro This macro is legacy from an early implementation of the init system before the pure level was split into early and late phases remove it now to avoid confusion going forward. Change-Id: I6720874c840c9e14888fd6f411a8182e7420ca29 Signed-off-by: Dirk Brandewie --- arch/arm/platforms/fsl_frdm_k64f/platform_config.c | 10 +++++----- arch/arm/platforms/ti_lm3s6965/platform_config.c | 6 +++--- arch/x86/platforms/galileo/galileo_config.c | 4 ++-- arch/x86/platforms/ia32/ia32_config.c | 4 ++-- arch/x86/platforms/ia32_pci/ia32_pci_config.c | 4 ++-- drivers/console/uart_console.c | 2 +- drivers/gpio/gpio-dw.c | 4 ++-- drivers/gpio/gpio-mmio.c | 4 ++-- drivers/i2c/i2c-dw.c | 2 +- drivers/spi/intel_spi.c | 4 ++-- include/init.h | 1 - samples/nanokernel/test/test_ipi/src/test_ipi.c | 2 +- 12 files changed, 23 insertions(+), 24 deletions(-) diff --git a/arch/arm/platforms/fsl_frdm_k64f/platform_config.c b/arch/arm/platforms/fsl_frdm_k64f/platform_config.c index 1659840d6e2..6fdedde8187 100644 --- a/arch/arm/platforms/fsl_frdm_k64f/platform_config.c +++ b/arch/arm/platforms/fsl_frdm_k64f/platform_config.c @@ -188,7 +188,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart0, &uart_platform_init, &k20_uart_dev_cfg[0]); -pure_init(k20_uart0, &k20_uart_dev_data[0]); +pure_late_init(k20_uart0, &k20_uart_dev_data[0]); /* UART 1 */ @@ -197,7 +197,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart1, &uart_platform_init, &k20_uart_dev_cfg[1]); -pure_init(k20_uart1, &k20_uart_dev_data[1]); +pure_late_init(k20_uart1, &k20_uart_dev_data[1]); /* UART 2 */ @@ -206,7 +206,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart2, &uart_platform_init, &k20_uart_dev_cfg[2]); -pure_init(k20_uart2, &k20_uart_dev_data[2]); +pure_late_init(k20_uart2, &k20_uart_dev_data[2]); /* UART 3 */ @@ -215,7 +215,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart3, &uart_platform_init, &k20_uart_dev_cfg[3]); -pure_init(k20_uart3, &k20_uart_dev_data[3]); +pure_late_init(k20_uart3, &k20_uart_dev_data[3]); /* UART 4 */ @@ -224,7 +224,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart4, &uart_platform_init, &k20_uart_dev_cfg[4]); -pure_init(k20_uart4, &k20_uart_dev_data[4]); +pure_late_init(k20_uart4, &k20_uart_dev_data[4]); /**< UART Devices */ diff --git a/arch/arm/platforms/ti_lm3s6965/platform_config.c b/arch/arm/platforms/ti_lm3s6965/platform_config.c index 087e6b2eea9..be3a0a5d723 100644 --- a/arch/arm/platforms/ti_lm3s6965/platform_config.c +++ b/arch/arm/platforms/ti_lm3s6965/platform_config.c @@ -194,7 +194,7 @@ DECLARE_DEVICE_INIT_CONFIG(stellaris_uart0, &uart_platform_init, &stellaris_uart_dev_cfg[0]); -pure_init(stellaris_uart0, NULL); +pure_late_init(stellaris_uart0, NULL); /* UART 1 */ @@ -203,7 +203,7 @@ DECLARE_DEVICE_INIT_CONFIG(stellaris_uart1, &uart_platform_init, &stellaris_uart_dev_cfg[1]); -pure_init(stellaris_uart1, NULL); +pure_late_init(stellaris_uart1, NULL); /* UART 2 */ @@ -212,7 +212,7 @@ DECLARE_DEVICE_INIT_CONFIG(stellaris_uart2, &uart_platform_init, &stellaris_uart_dev_cfg[2]); -pure_init(stellaris_uart2, NULL); +pure_late_init(stellaris_uart2, NULL); /**< UART Devices */ diff --git a/arch/x86/platforms/galileo/galileo_config.c b/arch/x86/platforms/galileo/galileo_config.c index 95d580bfc68..0a251b9240e 100644 --- a/arch/x86/platforms/galileo/galileo_config.c +++ b/arch/x86/platforms/galileo/galileo_config.c @@ -137,7 +137,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0, (CONFIG_UART_CONSOLE_INDEX == 0)) pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #else -pure_init(ns16550_uart0, &ns16550_uart_dev_data[0]); +pure_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #endif /* CONFIG_EARLY_CONSOLE */ @@ -152,7 +152,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1, (CONFIG_UART_CONSOLE_INDEX == 1)) pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #else -pure_init(ns16550_uart1, &ns16550_uart_dev_data[1]); +pure_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #endif /* CONFIG_EARLY_CONSOLE */ diff --git a/arch/x86/platforms/ia32/ia32_config.c b/arch/x86/platforms/ia32/ia32_config.c index 73c6e368077..0cfa6e34c65 100644 --- a/arch/x86/platforms/ia32/ia32_config.c +++ b/arch/x86/platforms/ia32/ia32_config.c @@ -124,7 +124,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0, (CONFIG_UART_CONSOLE_INDEX == 0)) pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #else -pure_init(ns16550_uart0, &ns16550_uart_dev_data[0]); +pure_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #endif /* CONFIG_EARLY_CONSOLE */ @@ -139,7 +139,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1, (CONFIG_UART_CONSOLE_INDEX == 1)) pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #else -pure_init(ns16550_uart1, &ns16550_uart_dev_data[1]); +pure_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #endif /* CONFIG_EARLY_CONSOLE */ diff --git a/arch/x86/platforms/ia32_pci/ia32_pci_config.c b/arch/x86/platforms/ia32_pci/ia32_pci_config.c index 541b982841f..7cb2566ea47 100644 --- a/arch/x86/platforms/ia32_pci/ia32_pci_config.c +++ b/arch/x86/platforms/ia32_pci/ia32_pci_config.c @@ -137,7 +137,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0, (CONFIG_UART_CONSOLE_INDEX == 0)) pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #else -pure_init(ns16550_uart0, &ns16550_uart_dev_data[0]); +pure_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #endif /* CONFIG_EARLY_CONSOLE */ @@ -152,7 +152,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1, (CONFIG_UART_CONSOLE_INDEX == 1)) pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #else -pure_init(ns16550_uart1, &ns16550_uart_dev_data[1]); +pure_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #endif /* CONFIG_EARLY_CONSOLE */ diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c index 15e391dcfbe..fc9e67621a1 100644 --- a/drivers/console/uart_console.c +++ b/drivers/console/uart_console.c @@ -245,4 +245,4 @@ static int uart_console_init(struct device *arg) return DEV_OK; } DECLARE_DEVICE_INIT_CONFIG(uart_console, "", uart_console_init, NULL); -pure_init(uart_console, NULL); +pure_late_init(uart_console, NULL); diff --git a/drivers/gpio/gpio-dw.c b/drivers/gpio/gpio-dw.c index 75bfbe50bfe..4df0488c3bf 100644 --- a/drivers/gpio/gpio-dw.c +++ b/drivers/gpio/gpio-dw.c @@ -357,7 +357,7 @@ struct gpio_runtime_dw gpio_0_runtime; DECLARE_DEVICE_INIT_CONFIG(gpio_0, CONFIG_GPIO_DW_0_NAME, gpio_initialize_dw, &gpio_config_dw_0); -pure_init(gpio_0, &gpio_0_runtime); +pure_late_init(gpio_0, &gpio_0_runtime); IRQ_CONNECT_STATIC(gpio_dw_0, CONFIG_GPIO_DW_0_IRQ, CONFIG_GPIO_DW_0_PRI, gpio_dw_isr_0, 0); @@ -399,7 +399,7 @@ struct gpio_runtime_dw gpio_1_runtime; DECLARE_DEVICE_INIT_CONFIG(gpio_1, CONFIG_GPIO_DW_1_NAME, gpio_initialize_dw, &gpio_config_dw_1); -pure_init(gpio_1, &gpio_1_runtime); +pure_late_init(gpio_1, &gpio_1_runtime); IRQ_CONNECT_STATIC(gpio_dw_1, CONFIG_GPIO_DW_1_IRQ, CONFIG_GPIO_DW_1_PRI, gpio_dw_isr_1, 0); diff --git a/drivers/gpio/gpio-mmio.c b/drivers/gpio/gpio-mmio.c index afee3984878..a121e13f7a5 100644 --- a/drivers/gpio/gpio-mmio.c +++ b/drivers/gpio/gpio-mmio.c @@ -290,7 +290,7 @@ DECLARE_DEVICE_INIT_CONFIG(gpio_mmio_0, CONFIG_GPIO_MMIO_0_DEV_NAME, gpio_mmio_init, &gpio_mmio_0_cfg); -pure_init(gpio_mmio_0, (void *)0); +pure_late_init(gpio_mmio_0, (void *)0); #endif /* CONFIG_GPIO_MMIO_0 */ @@ -312,6 +312,6 @@ DECLARE_DEVICE_INIT_CONFIG(gpio_mmio_1, CONFIG_GPIO_MMIO_1_DEV_NAME, gpio_mmio_init, &gpio_mmio_1_cfg); -pure_init(gpio_mmio_1, (void *)0); +pure_late_init(gpio_mmio_1, (void *)0); #endif /* CONFIG_GPIO_MMIO_1 */ diff --git a/drivers/i2c/i2c-dw.c b/drivers/i2c/i2c-dw.c index f7c6e69c605..73db2104054 100644 --- a/drivers/i2c/i2c-dw.c +++ b/drivers/i2c/i2c-dw.c @@ -636,7 +636,7 @@ DECLARE_DEVICE_INIT_CONFIG(i2c_0, &i2c_dw_initialize, &i2c_config_dw_0); -pure_init(i2c_0, &i2c_0_runtime); +pure_late_init(i2c_0, &i2c_0_runtime); IRQ_CONNECT_STATIC(i2c_dw_0, CONFIG_I2C_DW_0_IRQ, diff --git a/drivers/spi/intel_spi.c b/drivers/spi/intel_spi.c index f560e0fe406..fd745741908 100644 --- a/drivers/spi/intel_spi.c +++ b/drivers/spi/intel_spi.c @@ -406,7 +406,7 @@ struct spi_intel_config spi_intel_config_0 = { DECLARE_DEVICE_INIT_CONFIG(spi_intel_port_0, CONFIG_SPI_INTEL_PORT_0_DRV_NAME, spi_intel_init, &spi_intel_config_0); -pure_init(spi_intel_port_0, &spi_intel_data_port_0); +pure_late_init(spi_intel_port_0, &spi_intel_data_port_0); void spi_intel_isr_0(void *unused) { @@ -446,7 +446,7 @@ struct spi_intel_config spi_intel_config_1 = { DECLARE_DEVICE_INIT_CONFIG(spi_intel_port_1, CONFIG_SPI_INTEL_PORT_1_DRV_NAME, spi_intel_init, &spi_intel_config_1); -pure_init(spi_intel_port_1, &spi_intel_data_port_1); +pure_late_init(spi_intel_port_1, &spi_intel_data_port_1); void spi_intel_isr_1(void *unused) { diff --git a/include/init.h b/include/init.h index 94cf27aa281..1b006dbcecd 100644 --- a/include/init.h +++ b/include/init.h @@ -70,7 +70,6 @@ /* Run on interrupt stack; no {micro,nano} kernel objects available */ #define pure_early_init(cfg, data) __define_initconfig(cfg, 0, data) -#define pure_init(cfg, data) __define_initconfig(cfg, 1, data) #define pure_late_init(cfg, data) __define_initconfig(cfg, 1, data) /* Run from nano kernel idle task; no micro kernel objects available */ diff --git a/samples/nanokernel/test/test_ipi/src/test_ipi.c b/samples/nanokernel/test/test_ipi/src/test_ipi.c index 545c2c9711a..de8bc7179ec 100644 --- a/samples/nanokernel/test/test_ipi/src/test_ipi.c +++ b/samples/nanokernel/test/test_ipi/src/test_ipi.c @@ -57,7 +57,7 @@ struct ipi_dummy_config_info ipi_dummy0_config_info = { struct ipi_dummy_driver_data ipi_dummy0_driver_data; DECLARE_DEVICE_INIT_CONFIG(ipi_dummy0, "ipi_dummy0", ipi_dummy_init, &ipi_dummy0_config_info); -pure_init(ipi_dummy0, &ipi_dummy0_driver_data); +pure_late_init(ipi_dummy0, &ipi_dummy0_driver_data); /* Sending side of the console IPI driver, will forward anything sent * to printf() since we selected IPI_CONSOLE_STDOUT */