Skip to content

Conversation

@soburi
Copy link
Member

@soburi soburi commented Nov 9, 2024

  • include/zephyr/drivers/dma/dma_smartbond.h and include/zephyr/dt-bindings/dma/dma_smartbond.h
  • include/zephyr/drivers/interrupt_controller/intc_esp32.h and include/zephyr/drivers/interrupt_controller/intc_esp32c3.h
  • include/zephyr/dt-bindings/pinctrl/gecko-pinctrl.h and include/zephyr/dt-bindings/pinctrl/gecko-pinctrl-s1.h

These define duplicated include-guard. Correcting these.

Both `include/zephyr/drivers/dma/dma_smartbond.h` and
`include/zephyr/dt-bindings/dma/dma_smartbond.h` define `DMA_SMARTBOND_H_`
to prevent duplicate inclusion, so it cannot be properly prevented.

Change to a file path name-based definition.

Signed-off-by: TOKITA Hiroshi <[email protected]>
Both `include/zephyr/drivers/interrupt_controller/intc_esp32.h` and
`include/zephyr/drivers/interrupt_controller/intc_esp32c3.h`
define `ZEPHYR_INCLUDE_DRIVERS_ESP_INTR_ALLOC_H__` to prevent
duplicate inclusion, so it cannot be properly prevented.

Change to a file path name-based definition.

Signed-off-by: TOKITA Hiroshi <[email protected]>
Both `include/zephyr/dt-bindings/pinctrl/gecko-pinctrl.h` and
`include/zephyr/dt-bindings/pinctrl/gecko-pinctrl-s1.h` define
`ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_GECKO_PINCTRL_H_`
to prevent duplicate inclusion.

Changed it to `ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_GECKO_PINCTRL_S1_H_`
in `include/zephyr/dt-bindings/pinctrl/gecko-pinctrl-s1.h` side.

Signed-off-by: TOKITA Hiroshi <[email protected]>
@zephyrbot zephyrbot requested review from gmarull and teburd November 9, 2024 06:17
@soburi soburi added the priority: low Low impact/importance bug label Nov 9, 2024
@soburi soburi added this to the v4.1.0 milestone Nov 9, 2024
@nashif nashif merged commit 2bb0a50 into zephyrproject-rtos:main Nov 19, 2024
32 checks passed
@soburi soburi deleted the correct_duplicated_include_guard branch November 19, 2024 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants