From 7b006066a48315ce9d60d580022540bd0f4158a0 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Wed, 14 Oct 2015 09:17:38 -0400 Subject: [PATCH] init: Simplify symbol name generated by DECLARE_DEVICE_INIT_CONFIG() Gets rid of the trailing initialization level character from the name of the device variable generated by the macro, since it serves no useful purpose. (The linker scripts place the various initialization sections in ascending order based on the name of the section, so there is no need to embed the initialization level in the variable name itself.) Change-Id: I56bb79a513b8f77fb1f3fbaccec14454c2520772 Signed-off-by: Allan Stephens --- 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 | 8 ++++---- arch/x86/platforms/ia32/ia32_config.c | 8 ++++---- arch/x86/platforms/ia32_pci/ia32_pci_config.c | 8 ++++---- drivers/gpio/gpio-dw.c | 4 ++-- drivers/i2c/i2c-dw.c | 2 +- drivers/shared_irq/shared_irq.c | 4 ++-- drivers/spi/intel_spi.c | 4 ++-- include/init.h | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/arm/platforms/fsl_frdm_k64f/platform_config.c b/arch/arm/platforms/fsl_frdm_k64f/platform_config.c index 7344ff5d26c..44ebc5cb8a9 100644 --- a/arch/arm/platforms/fsl_frdm_k64f/platform_config.c +++ b/arch/arm/platforms/fsl_frdm_k64f/platform_config.c @@ -215,11 +215,11 @@ pre_kernel_late_init(k20_uart4, &k20_uart_dev_data[4]); /**< UART Devices */ struct device * const uart_devs[] = { - &__initconfig_k20_uart02, - &__initconfig_k20_uart12, - &__initconfig_k20_uart22, - &__initconfig_k20_uart32, - &__initconfig_k20_uart42, + &__initconfig_k20_uart0, + &__initconfig_k20_uart1, + &__initconfig_k20_uart2, + &__initconfig_k20_uart3, + &__initconfig_k20_uart4, }; #endif /* CONFIG_K20_UART */ diff --git a/arch/arm/platforms/ti_lm3s6965/platform_config.c b/arch/arm/platforms/ti_lm3s6965/platform_config.c index d3613e1da71..840859b1095 100644 --- a/arch/arm/platforms/ti_lm3s6965/platform_config.c +++ b/arch/arm/platforms/ti_lm3s6965/platform_config.c @@ -203,9 +203,9 @@ pre_kernel_late_init(stellaris_uart2, NULL); /**< UART Devices */ struct device * const uart_devs[] = { - &__initconfig_stellaris_uart02, - &__initconfig_stellaris_uart12, - &__initconfig_stellaris_uart22, + &__initconfig_stellaris_uart0, + &__initconfig_stellaris_uart1, + &__initconfig_stellaris_uart2, }; #endif /* CONFIG_STELLARIS_UART */ diff --git a/arch/x86/platforms/galileo/galileo_config.c b/arch/x86/platforms/galileo/galileo_config.c index f7c9464ff75..b036124d9f9 100644 --- a/arch/x86/platforms/galileo/galileo_config.c +++ b/arch/x86/platforms/galileo/galileo_config.c @@ -147,16 +147,16 @@ struct device * const uart_devs[] = { #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 0)) - &__initconfig_ns16550_uart01, + &__initconfig_ns16550_uart0, #else - &__initconfig_ns16550_uart02, + &__initconfig_ns16550_uart0, #endif /* CONFIG_EARLY_CONSOLE */ #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 1)) - &__initconfig_ns16550_uart11, + &__initconfig_ns16550_uart1, #else - &__initconfig_ns16550_uart12, + &__initconfig_ns16550_uart1, #endif /* CONFIG_EARLY_CONSOLE */ }; diff --git a/arch/x86/platforms/ia32/ia32_config.c b/arch/x86/platforms/ia32/ia32_config.c index 895704795cd..661988e1c00 100644 --- a/arch/x86/platforms/ia32/ia32_config.c +++ b/arch/x86/platforms/ia32/ia32_config.c @@ -134,16 +134,16 @@ struct device * const uart_devs[] = { #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 0)) - &__initconfig_ns16550_uart00, + &__initconfig_ns16550_uart0, #else - &__initconfig_ns16550_uart01, + &__initconfig_ns16550_uart0, #endif /* CONFIG_EARLY_CONSOLE */ #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 1)) - &__initconfig_ns16550_uart10, + &__initconfig_ns16550_uart1, #else - &__initconfig_ns16550_uart11, + &__initconfig_ns16550_uart1, #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 50471a423c8..78eb513382d 100644 --- a/arch/x86/platforms/ia32_pci/ia32_pci_config.c +++ b/arch/x86/platforms/ia32_pci/ia32_pci_config.c @@ -147,16 +147,16 @@ struct device * const uart_devs[] = { #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 0)) - &__initconfig_ns16550_uart01, + &__initconfig_ns16550_uart0, #else - &__initconfig_ns16550_uart02, + &__initconfig_ns16550_uart0, #endif /* CONFIG_EARLY_CONSOLE */ #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 1)) - &__initconfig_ns16550_uart11, + &__initconfig_ns16550_uart1, #else - &__initconfig_ns16550_uart12, + &__initconfig_ns16550_uart1, #endif /* CONFIG_EARLY_CONSOLE */ }; diff --git a/drivers/gpio/gpio-dw.c b/drivers/gpio/gpio-dw.c index e4d5846e649..5cf1a00904c 100644 --- a/drivers/gpio/gpio-dw.c +++ b/drivers/gpio/gpio-dw.c @@ -390,7 +390,7 @@ void gpio_config_0_irq(struct device *port) #ifdef CONFIG_GPIO_DW_0_IRQ_DIRECT void gpio_dw_isr_0(void *unused) { - gpio_dw_isr(&__initconfig_gpio_02); + gpio_dw_isr(&__initconfig_gpio_0); } #endif /* CONFIG_GPIO_DW_0_IRQ_DIRECT */ @@ -453,7 +453,7 @@ void gpio_config_1_irq(struct device *port) #ifdef CONFIG_GPIO_DW_1_IRQ_DIRECT void gpio_dw_isr_1(void *unused) { - gpio_dw_isr(&__initconfig_gpio_12); + gpio_dw_isr(&__initconfig_gpio_1); } #endif diff --git a/drivers/i2c/i2c-dw.c b/drivers/i2c/i2c-dw.c index ba719376aee..82ccffae43d 100644 --- a/drivers/i2c/i2c-dw.c +++ b/drivers/i2c/i2c-dw.c @@ -867,7 +867,7 @@ void i2c_config_0(struct device *port) #ifdef CONFIG_I2C_DW_0_IRQ_DIRECT void i2c_dw_isr_0(void *unused) { - i2c_dw_isr(&__initconfig_i2c_02); + i2c_dw_isr(&__initconfig_i2c_0); } #endif diff --git a/drivers/shared_irq/shared_irq.c b/drivers/shared_irq/shared_irq.c index 2474a8b090f..bd62e8126ca 100644 --- a/drivers/shared_irq/shared_irq.c +++ b/drivers/shared_irq/shared_irq.c @@ -156,7 +156,7 @@ void shared_irq_config_0_irq(struct device *port) void shared_irq_isr_0(void *unused) { - shared_irq_isr(&__initconfig_shared_irq_01); + shared_irq_isr(&__initconfig_shared_irq_0); } #endif /* CONFIG_SHARED_IRQ_0 */ @@ -188,7 +188,7 @@ void shared_irq_config_1_irq(struct device *port) void shared_irq_isr_1(void *unused) { - shared_irq_isr(&__initconfig_shared_irq_11); + shared_irq_isr(&__initconfig_shared_irq_1); } #endif /* CONFIG_SHARED_IRQ_1 */ diff --git a/drivers/spi/intel_spi.c b/drivers/spi/intel_spi.c index 26cead839b0..88c49eb5021 100644 --- a/drivers/spi/intel_spi.c +++ b/drivers/spi/intel_spi.c @@ -453,7 +453,7 @@ nano_early_init(spi_intel_port_0, &spi_intel_data_port_0); void spi_intel_isr_0(void *unused) { - spi_intel_isr(&__initconfig_spi_intel_port_03); + spi_intel_isr(&__initconfig_spi_intel_port_0); } IRQ_CONNECT_STATIC(spi_intel_irq_port_0, CONFIG_SPI_INTEL_PORT_0_IRQ, @@ -496,7 +496,7 @@ pre_kernel_late_init(spi_intel_port_1, &spi_intel_data_port_1); void spi_intel_isr_1(void *unused) { - spi_intel_isr(&__initconfig_spi_intel_port_12); + spi_intel_isr(&__initconfig_spi_intel_port_1); } IRQ_CONNECT_STATIC(spi_intel_irq_port_1, CONFIG_SPI_INTEL_PORT_1_IRQ, diff --git a/include/init.h b/include/init.h index 2108b1f15a1..0def3754d50 100644 --- a/include/init.h +++ b/include/init.h @@ -50,7 +50,7 @@ * @sa DECLARE_DEVICE_INIT_CONFIG() */ #define __define_initconfig(cfg_name, id, data) \ - static struct device (__initconfig_##cfg_name##id) __used \ + static struct device (__initconfig_##cfg_name) __used \ __attribute__((__section__(".initconfig" #id ".init"))) = { \ .config = &(config_##cfg_name),\ .driver_data = data}