Remove duplicate includes across multiple files

This commit cleans up redundant header file includes throughout the codebase. The changes include: - Removing duplicate #include directives that were present in the same file - Consolidating includes that were split across multiple lines unnecessarily - Removing unused includes that were no longer needed - Fixing some formatting issues with includes The changes improve code organization and maintainability by: - Reducing unnecessary dependencies - Making include dependencies more explicit - Following consistent include patterns - Removing dead code No functional changes are made - this is purely a code cleanup commit. Signed-off-by: Huang Qi <[email protected]>
apache · Jan 9, 2025 · cfd0cc0 · cfd0cc0
1 parent bb4eb12
commit cfd0cc0
Show file tree

Hide file tree

Showing 152 changed files with 7 additions and 256 deletions.
diff --git a/arch/arm/src/at32/at32_adc.c b/arch/arm/src/at32/at32_adc.c
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <unistd.h>
 
 #include <arch/board/board.h>
 #include <nuttx/irq.h>

diff --git a/arch/arm/src/at32/at32_eth.c b/arch/arm/src/at32/at32_eth.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <assert.h>
 #include <errno.h>
 
 #include <arpa/inet.h>

diff --git a/arch/arm/src/cxd56xx/cxd56_charger.c b/arch/arm/src/cxd56xx/cxd56_charger.c
@@ -29,7 +29,6 @@
 
 #include <nuttx/config.h>
 #include <assert.h>
-#include <debug.h>
 
 #include <sys/types.h>
 #include <stdio.h>

diff --git a/arch/arm/src/cxd56xx/cxd56_gauge.c b/arch/arm/src/cxd56xx/cxd56_gauge.c
@@ -27,7 +27,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <debug.h>
 
 #include <sys/types.h>
 #include <stdio.h>

diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <unistd.h>
 
 #include <arch/board/board.h>
 #include <nuttx/irq.h>

diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
@@ -33,7 +33,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/irq.h>
 #include <arch/armv7-m/nvicpri.h>
 
 #include "nvic.h"

diff --git a/arch/arm/src/eoss3/eoss3_irq.c b/arch/arm/src/eoss3/eoss3_irq.c
@@ -33,7 +33,6 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/irq.h>
 #include <arch/armv7-m/nvicpri.h>
 
 #include "nvic.h"

diff --git a/arch/arm/src/imx9/imx9_lowputc.c b/arch/arm/src/imx9/imx9_lowputc.c
@@ -41,7 +41,6 @@
 #include "imx9_clockconfig.h"
 #include "imx9_iomuxc.h"
 #include "hardware/imx9_clock.h"
-#include "hardware/imx9_pinmux.h"
 
 #include <arch/board/board.h> /* Include last:  has dependencies */
 

diff --git a/arch/arm/src/imxrt/imxrt_iomuxc_ver1.c b/arch/arm/src/imxrt/imxrt_iomuxc_ver1.c
@@ -24,13 +24,11 @@
  * Included Files
  ****************************************************************************/
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <stdbool.h>
-
 #include <nuttx/config.h>
 
+#include <sys/types.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <assert.h>
 #include <errno.h>
 

diff --git a/arch/arm/src/imxrt/imxrt_iomuxc_ver2.c b/arch/arm/src/imxrt/imxrt_iomuxc_ver2.c
@@ -24,13 +24,11 @@
  * Included Files
  ****************************************************************************/
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <stdbool.h>
-
 #include <nuttx/config.h>
 
+#include <sys/types.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <assert.h>
 #include <errno.h>
 

diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c
@@ -49,7 +49,6 @@
 #include "imxrt_lpi2c.h"
 #include "imxrt_edma.h"
 #include "imxrt_gpio.h"
-#include "imxrt_lpi2c.h"
 
 #include "hardware/imxrt_dmamux.h"
 #include "hardware/imxrt_pinmux.h"

diff --git a/arch/arm/src/kinetis/kinetis_pindma.c b/arch/arm/src/kinetis/kinetis_pindma.c
@@ -34,7 +34,6 @@
 
 #include <arch/board/board.h>
 
-#include <nuttx/arch.h>
 #include <nuttx/arch.h>
 #include "arm_internal.h"
 #include "kinetis_config.h"

diff --git a/arch/arm/src/kl/kl_lowputc.c b/arch/arm/src/kl/kl_lowputc.c
@@ -40,7 +40,6 @@
 #include "hardware/kl_uart.h"
 #include "hardware/kl_sim.h"
 #include "hardware/kl_port.h"
-#include "hardware/kl_uart.h"
 #include "hardware/kl_pinmux.h"
 
 /****************************************************************************

diff --git a/arch/arm/src/lc823450/lc823450_adc.c b/arch/arm/src/lc823450/lc823450_adc.c
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <unistd.h>
 
 #include <arch/board/board.h>
 

diff --git a/arch/arm/src/lc823450/lc823450_sddrv_dep.c b/arch/arm/src/lc823450/lc823450_sddrv_dep.c
@@ -59,7 +59,6 @@
 #include "arm_internal.h"
 #include "lc823450_sddrv_type.h"
 #include "lc823450_sddrv_if.h"
-#include "lc823450_dma.h"
 #include "lc823450_gpio.h"
 #include "lc823450_syscontrol.h"
 #include "lc823450_timer.h"

diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
@@ -65,7 +65,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_i2c.h"

diff --git a/arch/arm/src/max326xx/hardware/max326_gcr.h b/arch/arm/src/max326xx/hardware/max326_gcr.h
@@ -23,12 +23,6 @@
 #ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GCR_H
 #define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GCR_H
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
 /****************************************************************************
  * Included Files
  ****************************************************************************/

diff --git a/arch/arm/src/max326xx/max32660/max32660_serial.c b/arch/arm/src/max326xx/max32660/max32660_serial.c
@@ -50,8 +50,6 @@
 #include "max326_lowputc.h"
 #include "max326_serial.h"
 
-#include <arch/board/board.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/

diff --git a/arch/arm/src/mps/mps_start.c b/arch/arm/src/mps/mps_start.c
@@ -25,7 +25,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/init.h>
 
 #include <nuttx/cache.h>
 #include <nuttx/init.h>

diff --git a/arch/arm/src/nrf52/nrf52_flash.c b/arch/arm/src/nrf52/nrf52_flash.c
@@ -45,7 +45,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/config.h>
 #include <nuttx/progmem.h>
 
 #include "chip.h"

diff --git a/arch/arm/src/nrf52/nrf52_usbd.h b/arch/arm/src/nrf52/nrf52_usbd.h
@@ -30,7 +30,6 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 
-#include <nuttx/config.h>
 #include <nuttx/usb/usbdev.h>
 #include <stdint.h>
 

diff --git a/arch/arm/src/nrf53/nrf53_usbd.h b/arch/arm/src/nrf53/nrf53_usbd.h
@@ -28,9 +28,8 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <stdbool.h>
 
-#include <nuttx/config.h>
+#include <stdbool.h>
 #include <nuttx/usb/usbdev.h>
 #include <stdint.h>
 

diff --git a/arch/arm/src/phy62xx/phyplus_stub.c b/arch/arm/src/phy62xx/phyplus_stub.c
@@ -42,7 +42,6 @@
 #include "phyplus_tim.h"
 #include "timer.h"
 #include "mcu_phy_bumbee.h"
-#include "phyplus_gpio.h"
 
 /****************************************************************************
  * Pre-processor Definitions

diff --git a/arch/arm/src/rp2040/rp2040_adc.c b/arch/arm/src/rp2040/rp2040_adc.c
@@ -63,7 +63,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 

diff --git a/arch/arm/src/rp2040/rp2040_ws2812.c b/arch/arm/src/rp2040/rp2040_ws2812.c
@@ -28,7 +28,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <nuttx/kmalloc.h>

diff --git a/arch/arm/src/rp23xx/rp23xx_adc.c b/arch/arm/src/rp23xx/rp23xx_adc.c
@@ -63,7 +63,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 

diff --git a/arch/arm/src/rp23xx/rp23xx_ws2812.c b/arch/arm/src/rp23xx/rp23xx_ws2812.c
@@ -28,7 +28,6 @@
 
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <nuttx/kmalloc.h>

diff --git a/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c b/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c
@@ -47,7 +47,6 @@
 
 #include "arm_internal.h"
 #include "s32k1xx_edma.h"
-#include "s32k1xx_pin.h"
 #include "hardware/s32k1xx_dmamux.h"
 #include "hardware/s32k1xx_pinmux.h"
 #include "s32k1xx_flexio_i2c.h"

diff --git a/arch/arm/src/s32k1xx/s32k1xx_pindma.c b/arch/arm/src/s32k1xx/s32k1xx_pindma.c
@@ -32,7 +32,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/arch.h>
 #include <nuttx/arch.h>
 #include "arm_internal.h"
 #include "s32k1xx_pin.h"

diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c
@@ -28,16 +28,13 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/wqueue.h>
 
 #include <time.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/arch.h>
-#include <nuttx/irq.h>
-#include <nuttx/wqueue.h>
-
 #include <arch/board/board.h>
 
 #include "arm_internal.h"

diff --git a/arch/arm/src/stm32f7/stm32_adc.c b/arch/arm/src/stm32f7/stm32_adc.c
@@ -38,7 +38,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <unistd.h>
 
 #include <arch/board/board.h>
 #include <nuttx/irq.h>

diff --git a/arch/arm/src/stm32wl5/stm32wl5_allocateheap.c b/arch/arm/src/stm32wl5/stm32wl5_allocateheap.c
@@ -41,7 +41,6 @@
 #include "chip.h"
 #include "mpu.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 #include "stm32wl5_mpuinit.h"
 #include "stm32wl5_ipcc.h"
 

diff --git a/arch/arm/src/stm32wl5/stm32wl5_irq.c b/arch/arm/src/stm32wl5/stm32wl5_irq.c
@@ -38,7 +38,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 #include "stm32wl5.h"
 
 /****************************************************************************

diff --git a/arch/arm/src/stm32wl5/stm32wl5_lowputc.c b/arch/arm/src/stm32wl5/stm32wl5_lowputc.c
@@ -30,7 +30,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_internal.h"
 #include "arm_internal.h"
 
 #include "chip.h"

diff --git a/arch/arm/src/stm32wl5/stm32wl5_rcc.c b/arch/arm/src/stm32wl5/stm32wl5_rcc.c
@@ -33,7 +33,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_internal.h"
 #include "arm_internal.h"
 
 #include "chip.h"

diff --git a/arch/arm/src/stm32wl5/stm32wl5_serial.c b/arch/arm/src/stm32wl5/stm32wl5_serial.c
@@ -57,7 +57,6 @@
 #endif
 #include "stm32wl5_rcc.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

diff --git a/arch/arm/src/stm32wl5/stm32wl5_start.c b/arch/arm/src/stm32wl5/stm32wl5_start.c
@@ -33,7 +33,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_internal.h"
 #include "arm_internal.h"
 #include "nvic.h"
 

diff --git a/arch/arm/src/stm32wl5/stm32wl5_tim.c b/arch/arm/src/stm32wl5/stm32wl5_tim.c
@@ -40,7 +40,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 
 #include "stm32wl5.h"
 #include "stm32wl5_gpio.h"

diff --git a/arch/arm/src/stm32wl5/stm32wl5_timerisr.c b/arch/arm/src/stm32wl5/stm32wl5_timerisr.c
@@ -35,7 +35,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32wl5.h"

diff --git a/arch/arm/src/tlsr82/tlsr82_spi_console.c b/arch/arm/src/tlsr82/tlsr82_spi_console.c
@@ -26,14 +26,12 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
-#include <nuttx/arch.h>
 #include <assert.h>
 #include <debug.h>
 #include <execinfo.h>
 
 #include <nuttx/compiler.h>
 #include <nuttx/board.h>
-#include <nuttx/arch.h>
 #include <nuttx/serial/serial.h>
 #include <arch/board/board.h>
 

diff --git a/arch/arm/src/tlsr82/tlsr82_timer_isr.c b/arch/arm/src/tlsr82/tlsr82_timer_isr.c
@@ -26,13 +26,10 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
-#include <nuttx/arch.h>
+#include <nuttx/board.h>
 
 #include <debug.h>
 #include <assert.h>
-
-#include <nuttx/board.h>
-#include <nuttx/irq.h>
 #include <arch/board/board.h>
 
 #include "arm_internal.h"

diff --git a/arch/arm64/src/common/arm64_fatal.c b/arch/arm64/src/common/arm64_fatal.c
@@ -46,7 +46,6 @@
 #include "arm64_internal.h"
 #include "arm64_fatal.h"
 #include "arm64_mmu.h"
-#include "arm64_fatal.h"
 #include "arm64_arch_timer.h"
 
 #ifdef CONFIG_ARCH_FPU

diff --git a/arch/risc-v/src/common/espressif/esp_efuse.c b/arch/risc-v/src/common/espressif/esp_efuse.c
@@ -26,12 +26,10 @@
 
 #include <stdlib.h>
 #include <debug.h>
-#include <debug.h>
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
 #include <sys/param.h>
-#include <nuttx/efuse/efuse.h>
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/efuse/efuse.h>