From 24ae1b1aa758be129cb64858e4ef7e1c83d0c573 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 9 Dec 2019 11:18:21 -0600 Subject: [PATCH] include: Fix use of -> Fix #include as misc/FOO.h has been deprecated and should be #include . Signed-off-by: Kumar Gala --- arch/arm/core/cortex_r/reboot.c | 2 +- arch/arm/core/cortex_r/vector_table.h | 2 +- arch/x86/core/early_serial.c | 2 +- drivers/adc/adc_shell.c | 2 +- drivers/can/can_shell.c | 2 +- drivers/clock_control/clock_stm32_ll_h7.c | 2 +- drivers/clock_control/clock_stm32g0.c | 2 +- drivers/ethernet/eth_liteeth.c | 2 +- drivers/ieee802154/ieee802154_cc13xx_cc26xx.c | 2 +- drivers/sensor/opt3001/opt3001.c | 2 +- drivers/sensor/opt3001/opt3001.h | 2 +- drivers/sensor/tmp116/tmp116.c | 6 +++--- include/arch/x86/ia32/arch.h | 2 +- include/drivers/espi.h | 2 +- samples/bluetooth/peripheral_ht/src/hts.c | 4 ++-- samples/bluetooth/peripheral_ht/src/main.c | 4 ++-- samples/boards/arc_secure_services/src/main.c | 2 +- samples/boards/intel_s1000_crb/audio/src/tuning_driver.c | 2 +- samples/drivers/CAN/src/main.c | 2 +- samples/drivers/espi/src/main.c | 2 +- samples/drivers/kscan/src/main.c | 2 +- samples/drivers/ps2/src/main.c | 2 +- samples/userspace/prod_consumer/src/main.c | 2 +- soc/arc/snps_arc_hsdk/soc.h | 4 ++-- soc/arc/snps_emsdp/soc.h | 4 ++-- soc/arm/common/cortex_m/arm_mpu_regions.c | 1 - soc/arm/microchip_mec/mec1501/device_power.c | 2 +- soc/arm/microchip_mec/mec1501/power.c | 2 +- soc/arm/nxp_kinetis/k2x/soc.h | 4 ++-- soc/arm/xilinx_zynqmp/soc.h | 4 ++-- .../controller/ll_sw/openisa/hal/RV32M1/radio/radio.c | 2 +- subsys/bluetooth/services/bas.c | 2 +- subsys/net/l2/canbus/6locan.c | 2 +- subsys/net/lib/sockets/sockets_net_mgmt.c | 4 ++-- tests/kernel/common/src/main.c | 2 +- tests/net/lib/dns_addremove/src/main.c | 2 +- tests/net/ppp/driver/src/main.c | 2 +- 37 files changed, 45 insertions(+), 46 deletions(-) diff --git a/arch/arm/core/cortex_r/reboot.c b/arch/arm/core/cortex_r/reboot.c index 1d38faf421a..6f149629c56 100644 --- a/arch/arm/core/cortex_r/reboot.c +++ b/arch/arm/core/cortex_r/reboot.c @@ -11,7 +11,7 @@ #include #include -#include +#include /** * diff --git a/arch/arm/core/cortex_r/vector_table.h b/arch/arm/core/cortex_r/vector_table.h index 837ab1ee613..9abbec1c8d9 100644 --- a/arch/arm/core/cortex_r/vector_table.h +++ b/arch/arm/core/cortex_r/vector_table.h @@ -26,7 +26,7 @@ #include #include -#include +#include GTEXT(__start) GTEXT(_vector_table) diff --git a/arch/x86/core/early_serial.c b/arch/x86/core/early_serial.c index 1af4a8625e6..63f255b3923 100644 --- a/arch/x86/core/early_serial.c +++ b/arch/x86/core/early_serial.c @@ -6,7 +6,7 @@ #include #include -#include +#include /* Super-primitive 8250/16550 serial output-only driver, 115200 8n1 */ diff --git a/drivers/adc/adc_shell.c b/drivers/adc/adc_shell.c index 563ac1a7b2e..143180961ed 100644 --- a/drivers/adc/adc_shell.c +++ b/drivers/adc/adc_shell.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL #include diff --git a/drivers/can/can_shell.c b/drivers/can/can_shell.c index 9357e25e475..38115ae551d 100644 --- a/drivers/can/can_shell.c +++ b/drivers/can/can_shell.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include #include diff --git a/drivers/clock_control/clock_stm32_ll_h7.c b/drivers/clock_control/clock_stm32_ll_h7.c index 5bab2d692e3..9dadd3e8801 100644 --- a/drivers/clock_control/clock_stm32_ll_h7.c +++ b/drivers/clock_control/clock_stm32_ll_h7.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include /* Macros to fill up prescaler values */ diff --git a/drivers/clock_control/clock_stm32g0.c b/drivers/clock_control/clock_stm32g0.c index 8ea7bc81cf1..090e251fc28 100644 --- a/drivers/clock_control/clock_stm32g0.c +++ b/drivers/clock_control/clock_stm32g0.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include "clock_stm32_ll_common.h" diff --git a/drivers/ethernet/eth_liteeth.c b/drivers/ethernet/eth_liteeth.c index c974d1dccd7..a0bce2d8096 100644 --- a/drivers/ethernet/eth_liteeth.c +++ b/drivers/ethernet/eth_liteeth.c @@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include #include -#include +#include /* flags */ #define LITEETH_EV_TX 0x1 diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c index 43b30676ec1..e45cc1f4f8d 100644 --- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c +++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c @@ -10,7 +10,7 @@ LOG_MODULE_REGISTER(ieee802154_cc13xx_cc26xx); #include #include -#include +#include #include #include #include diff --git a/drivers/sensor/opt3001/opt3001.c b/drivers/sensor/opt3001/opt3001.c index 429c3f6edbe..1cccb4d65fc 100644 --- a/drivers/sensor/opt3001/opt3001.c +++ b/drivers/sensor/opt3001/opt3001.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "opt3001.h" diff --git a/drivers/sensor/opt3001/opt3001.h b/drivers/sensor/opt3001/opt3001.h index 132ceefa047..69d67ca8ba6 100644 --- a/drivers/sensor/opt3001/opt3001.h +++ b/drivers/sensor/opt3001/opt3001.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_DRIVERS_SENSOR_OPT3001_H_ #define ZEPHYR_DRIVERS_SENSOR_OPT3001_H_ -#include +#include #define OPT3001_REG_RESULT 0x00 #define OPT3001_REG_CONFIG 0x01 diff --git a/drivers/sensor/tmp116/tmp116.c b/drivers/sensor/tmp116/tmp116.c index 1dd33c4a30c..01a15caab0d 100644 --- a/drivers/sensor/tmp116/tmp116.c +++ b/drivers/sensor/tmp116/tmp116.c @@ -7,9 +7,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/include/arch/x86/ia32/arch.h b/include/arch/x86/ia32/arch.h index 49a5cda9a05..c5caf07cac4 100644 --- a/include/arch/x86/ia32/arch.h +++ b/include/arch/x86/ia32/arch.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/drivers/espi.h b/include/drivers/espi.h index f7a436ec8ba..45f5492dc93 100644 --- a/include/drivers/espi.h +++ b/include/drivers/espi.h @@ -13,7 +13,7 @@ #ifndef ZEPHYR_INCLUDE_ESPI_H_ #define ZEPHYR_INCLUDE_ESPI_H_ -#include +#include #include #include diff --git a/samples/bluetooth/peripheral_ht/src/hts.c b/samples/bluetooth/peripheral_ht/src/hts.c index 3c5b971b1db..c527bd2b7db 100644 --- a/samples/bluetooth/peripheral_ht/src/hts.c +++ b/samples/bluetooth/peripheral_ht/src/hts.c @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/samples/bluetooth/peripheral_ht/src/main.c b/samples/bluetooth/peripheral_ht/src/main.c index 9611dfe7cd5..3694e9a8fc5 100644 --- a/samples/bluetooth/peripheral_ht/src/main.c +++ b/samples/bluetooth/peripheral_ht/src/main.c @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/samples/boards/arc_secure_services/src/main.c b/samples/boards/arc_secure_services/src/main.c index 8e7a7be238c..519da9569ea 100644 --- a/samples/boards/arc_secure_services/src/main.c +++ b/samples/boards/arc_secure_services/src/main.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #if defined(CONFIG_SOC_NSIM_SEM) diff --git a/samples/boards/intel_s1000_crb/audio/src/tuning_driver.c b/samples/boards/intel_s1000_crb/audio/src/tuning_driver.c index 7ade5a9ea83..25e79dd5eeb 100644 --- a/samples/boards/intel_s1000_crb/audio/src/tuning_driver.c +++ b/samples/boards/intel_s1000_crb/audio/src/tuning_driver.c @@ -8,7 +8,7 @@ #include LOG_MODULE_REGISTER(tuning); -#include +#include #include #include diff --git a/samples/drivers/CAN/src/main.c b/samples/drivers/CAN/src/main.c index 975170736b4..fe11521f48b 100644 --- a/samples/drivers/CAN/src/main.c +++ b/samples/drivers/CAN/src/main.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #define RX_THREAD_STACK_SIZE 512 #define RX_THREAD_PRIORITY 2 diff --git a/samples/drivers/espi/src/main.c b/samples/drivers/espi/src/main.c index 1bd39a3544e..c68cfa14e5f 100644 --- a/samples/drivers/espi/src/main.c +++ b/samples/drivers/espi/src/main.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/samples/drivers/kscan/src/main.c b/samples/drivers/kscan/src/main.c index 05a15fb3024..84e471f0e83 100644 --- a/samples/drivers/kscan/src/main.c +++ b/samples/drivers/kscan/src/main.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include diff --git a/samples/drivers/ps2/src/main.c b/samples/drivers/ps2/src/main.c index 930721254e0..2ee9de98c01 100644 --- a/samples/drivers/ps2/src/main.c +++ b/samples/drivers/ps2/src/main.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #define LOG_LEVEL LOG_LEVEL_DBG diff --git a/samples/userspace/prod_consumer/src/main.c b/samples/userspace/prod_consumer/src/main.c index cad8e2cf7d0..98cfb9402d6 100644 --- a/samples/userspace/prod_consumer/src/main.c +++ b/samples/userspace/prod_consumer/src/main.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/soc/arc/snps_arc_hsdk/soc.h b/soc/arc/snps_arc_hsdk/soc.h index 9a87c67eb87..c4044001936 100644 --- a/soc/arc/snps_arc_hsdk/soc.h +++ b/soc/arc/snps_arc_hsdk/soc.h @@ -14,7 +14,7 @@ #ifndef _SOC_H_ #define _SOC_H_ -#include +#include /* ARC HS Core IRQs */ @@ -29,7 +29,7 @@ #ifndef _ASMLANGUAGE -#include +#include #include /* diff --git a/soc/arc/snps_emsdp/soc.h b/soc/arc/snps_emsdp/soc.h index 704dce5b321..e691eadf197 100644 --- a/soc/arc/snps_emsdp/soc.h +++ b/soc/arc/snps_emsdp/soc.h @@ -14,7 +14,7 @@ #ifndef _SOC_H_ #define _SOC_H_ -#include +#include /* default system clock */ #define SYSCLK_DEFAULT_IOSC_HZ MHZ(100) @@ -25,7 +25,7 @@ #ifndef _ASMLANGUAGE -#include +#include #include /* diff --git a/soc/arm/common/cortex_m/arm_mpu_regions.c b/soc/arm/common/cortex_m/arm_mpu_regions.c index 2428e2f473c..f9c7397b715 100644 --- a/soc/arm/common/cortex_m/arm_mpu_regions.c +++ b/soc/arm/common/cortex_m/arm_mpu_regions.c @@ -5,7 +5,6 @@ */ #include -#include #include #include "arm_mpu_mem_cfg.h" diff --git a/soc/arm/microchip_mec/mec1501/device_power.c b/soc/arm/microchip_mec/mec1501/device_power.c index f1301f93d43..aa2c5a13f0b 100644 --- a/soc/arm/microchip_mec/mec1501/device_power.c +++ b/soc/arm/microchip_mec/mec1501/device_power.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/soc/arm/microchip_mec/mec1501/power.c b/soc/arm/microchip_mec/mec1501/power.c index bea02124ec8..049b1de9713 100644 --- a/soc/arm/microchip_mec/mec1501/power.c +++ b/soc/arm/microchip_mec/mec1501/power.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include "device_power.h" diff --git a/soc/arm/nxp_kinetis/k2x/soc.h b/soc/arm/nxp_kinetis/k2x/soc.h index 509de9854db..6d02344616c 100644 --- a/soc/arm/nxp_kinetis/k2x/soc.h +++ b/soc/arm/nxp_kinetis/k2x/soc.h @@ -17,7 +17,7 @@ #ifndef _SOC__H_ #define _SOC__H_ -#include +#include #ifdef __cplusplus extern "C" { @@ -37,7 +37,7 @@ extern "C" { #include #include -#include +#include #include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/xilinx_zynqmp/soc.h b/soc/arm/xilinx_zynqmp/soc.h index 6df67841233..9a53a709ebb 100644 --- a/soc/arm/xilinx_zynqmp/soc.h +++ b/soc/arm/xilinx_zynqmp/soc.h @@ -8,12 +8,12 @@ #ifndef _BOARD__H_ #define _BOARD__H_ -#include +#include #ifndef _ASMLANGUAGE #include -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c index 9ba95d209b2..e20fb745414 100644 --- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c +++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include #include diff --git a/subsys/bluetooth/services/bas.c b/subsys/bluetooth/services/bas.c index d112557f61b..585da309fc5 100644 --- a/subsys/bluetooth/services/bas.c +++ b/subsys/bluetooth/services/bas.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/subsys/net/l2/canbus/6locan.c b/subsys/net/l2/canbus/6locan.c index f85dd8d25a7..3f7e12bb057 100644 --- a/subsys/net/l2/canbus/6locan.c +++ b/subsys/net/l2/canbus/6locan.c @@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_l2_canbus, CONFIG_NET_L2_CANBUS_LOG_LEVEL); #include <6lo.h> #include #include -#include +#include #include #include #include diff --git a/subsys/net/lib/sockets/sockets_net_mgmt.c b/subsys/net/lib/sockets/sockets_net_mgmt.c index 51d0d1c1747..499601bc627 100644 --- a/subsys/net/lib/sockets/sockets_net_mgmt.c +++ b/subsys/net/lib/sockets/sockets_net_mgmt.c @@ -11,10 +11,10 @@ LOG_MODULE_REGISTER(net_sock_mgmt, CONFIG_NET_SOCKETS_LOG_LEVEL); #include -#include +#include #include #include -#include +#include #include #include diff --git a/tests/kernel/common/src/main.c b/tests/kernel/common/src/main.c index c85223b4217..9abe84d8018 100644 --- a/tests/kernel/common/src/main.c +++ b/tests/kernel/common/src/main.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include "version.h" extern void test_byteorder_memcpy_swap(void); diff --git a/tests/net/lib/dns_addremove/src/main.c b/tests/net/lib/dns_addremove/src/main.c index 48038470b22..5fcc10ce1e9 100644 --- a/tests/net/lib/dns_addremove/src/main.c +++ b/tests/net/lib/dns_addremove/src/main.c @@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL); #include #include #include -#include +#include #include diff --git a/tests/net/ppp/driver/src/main.c b/tests/net/ppp/driver/src/main.c index 47b7b21b3dc..13ab5c9ae60 100644 --- a/tests/net/ppp/driver/src/main.c +++ b/tests/net/ppp/driver/src/main.c @@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); #include #include #include -#include +#include #include #include