Skip to content

Commit 24d09d3

Browse files
committed
include: fix the remaining legacy #include paths
Add the "zephyr/" prefix to various #include statements that are preventing the CI form running with LEGACY_INCLUDE_PATH=n. Signed-off-by: Fabio Baltieri <[email protected]>
1 parent def2301 commit 24d09d3

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

drivers/clock_control/clock_control_ast10x0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <zephyr/sys/util.h>
1313

1414
#define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
15-
#include <logging/log.h>
15+
#include <zephyr/logging/log.h>
1616
LOG_MODULE_REGISTER(clock_control_ast10x0);
1717

1818
#define HPLL_FREQ MHZ(1000)

drivers/gpio/gpio_mchp_mss.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#define DT_DRV_COMPAT microchip_mpfs_gpio
88

99
#include <errno.h>
10-
#include <kernel.h>
11-
#include <device.h>
10+
#include <zephyr/kernel.h>
11+
#include <zephyr/device.h>
1212
#include <soc.h>
13-
#include <drivers/gpio.h>
14-
#include <sys/util.h>
13+
#include <zephyr/drivers/gpio.h>
14+
#include <zephyr/sys/util.h>
1515

1616
#include "gpio_utils.h"
1717

include/zephyr/logging/log.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ void z_log_vprintk(const char *fmt, va_list ap);
322322
/**
323323
* @brief Create module-specific state and register the module with Logger.
324324
*
325-
* This macro normally must be used after including <logging/log.h> to
325+
* This macro normally must be used after including <zephyr/logging/log.h> to
326326
* complete the initialization of the module.
327327
*
328328
* Module registration can be skipped in two cases:

include/zephyr/sys/atomic.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ typedef atomic_ptr_t atomic_ptr_val_t;
3333
/* Some architectures need their own implementation */
3434
# ifdef CONFIG_XTENSA
3535
/* Not all Xtensa toolchains support GCC-style atomic intrinsics */
36-
# include <arch/xtensa/atomic_xtensa.h>
36+
# include <zephyr/arch/xtensa/atomic_xtensa.h>
3737
# else
3838
/* Other arch specific implementation */
39-
# include <sys/atomic_arch.h>
39+
# include <zephyr/sys/atomic_arch.h>
4040
# endif /* CONFIG_XTENSA */
4141
#else
4242
/* Default. See this file for the Doxygen reference: */

soc/arm/atmel_sam0/saml21/linker.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8-
#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
8+
#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>

soc/arm/atmel_sam0/samr34/linker.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8-
#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
8+
#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>

soc/arm/intel_socfpga_std/cyclonev/linker.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* Adding support for Cyclone V SoC FPGA, using arm32 linker
66
*/
77

8-
#include <arch/arm/aarch32/cortex_a_r/scripts/linker.ld>
8+
#include <zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld>

subsys/rtio/rtio_executor_concurrent.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include "spinlock.h"
7+
#include <zephyr/spinlock.h>
88
#include <zephyr/rtio/rtio_executor_concurrent.h>
99
#include <zephyr/rtio/rtio.h>
1010
#include <zephyr/kernel.h>

0 commit comments

Comments
 (0)