Skip to content

Commit

Permalink
Remove duplicate includes across multiple files
Browse files Browse the repository at this point in the history
 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]>
  • Loading branch information
no1wudi committed Jan 9, 2025
1 parent cb980cc commit 610782f
Show file tree
Hide file tree
Showing 147 changed files with 12 additions and 257 deletions.
1 change: 0 additions & 1 deletion arch/arm/src/cxd56xx/cxd56_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

#include <nuttx/config.h>
#include <assert.h>
#include <debug.h>

#include <sys/types.h>
#include <stdio.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/cxd56xx/cxd56_gauge.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
****************************************************************************/

#include <nuttx/config.h>
#include <debug.h>

#include <sys/types.h>
#include <stdio.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/efm32/efm32_adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/efm32/efm32_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/eoss3/eoss3_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/imx9/imx9_lowputc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
6 changes: 2 additions & 4 deletions arch/arm/src/imxrt/imxrt_iomuxc_ver1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 2 additions & 4 deletions arch/arm/src/imxrt/imxrt_iomuxc_ver2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/imxrt/imxrt_lpi2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/kinetis/kinetis_pindma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/kl/kl_lowputc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/****************************************************************************
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/lc823450/lc823450_adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <errno.h>
#include <assert.h>
#include <debug.h>
#include <unistd.h>

#include <arch/board/board.h>

Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/lc823450/lc823450_sddrv_dep.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/src/max326xx/hardware/max326_gcr.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
****************************************************************************/
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/src/max326xx/max32660/max32660_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
#include "max326_lowputc.h"
#include "max326_serial.h"

#include <arch/board/board.h>

/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/src/mps/mps_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
****************************************************************************/

#include <nuttx/config.h>
#include <nuttx/init.h>

#include <nuttx/cache.h>
#include <nuttx/init.h>
#include <arch/board/board.h>

#include "arm_internal.h"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/nrf52/nrf52_flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
#include <errno.h>
#include <debug.h>

#include <nuttx/config.h>
#include <nuttx/progmem.h>

#include "chip.h"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/nrf52/nrf52_usbd.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include <nuttx/config.h>
#include <stdbool.h>

#include <nuttx/config.h>
#include <nuttx/usb/usbdev.h>
#include <stdint.h>

Expand Down
3 changes: 1 addition & 2 deletions arch/arm/src/nrf53/nrf53_usbd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/phy62xx/phyplus_stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include "phyplus_tim.h"
#include "timer.h"
#include "mcu_phy_bumbee.h"
#include "phyplus_gpio.h"

/****************************************************************************
* Pre-processor Definitions
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/rp2040/rp2040_adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@

#include <stdlib.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>

Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/rp2040/rp2040_ws2812.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

#include <stdlib.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>

#include <nuttx/kmalloc.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/rp23xx/rp23xx_adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@

#include <stdlib.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>

Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/rp23xx/rp23xx_ws2812.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

#include <stdlib.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>

#include <nuttx/kmalloc.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/s32k1xx/s32k1xx_pindma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 1 addition & 4 deletions arch/arm/src/sama5/sam_rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/stm32wl5/stm32wl5_allocateheap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/stm32wl5/stm32wl5_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include "nvic.h"
#include "ram_vectors.h"
#include "arm_internal.h"
#include "arm_internal.h"
#include "stm32wl5.h"

/****************************************************************************
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/stm32wl5/stm32wl5_lowputc.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

#include <arch/board/board.h>

#include "arm_internal.h"
#include "arm_internal.h"

#include "chip.h"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/stm32wl5/stm32wl5_rcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

#include <arch/board/board.h>

#include "arm_internal.h"
#include "arm_internal.h"

#include "chip.h"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/stm32wl5/stm32wl5_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include <nuttx/init.h>
#include <arch/board/board.h>

#include "arm_internal.h"
#include "arm_internal.h"
#include "nvic.h"

Expand Down
1 change: 0 additions & 1 deletion arch/arm/src/stm32wl5/stm32wl5_timerisr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/src/tlsr82/tlsr82_spi_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 1 addition & 4 deletions arch/arm/src/tlsr82/tlsr82_timer_isr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm64/src/common/arm64_fatal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions arch/risc-v/src/common/espressif/esp_efuse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion arch/risc-v/src/common/espressif/esp_temperature_sensor.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include <nuttx/spinlock.h>
#include <nuttx/can/can.h>
#include <nuttx/signal.h>
#include <nuttx/arch.h>
#include <nuttx/kthread.h>
#ifdef CONFIG_ESPRESSIF_TEMP_UORB
#include <nuttx/sensors/sensor.h>
Expand Down
1 change: 0 additions & 1 deletion arch/risc-v/src/common/espressif/esp_ws2812.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

#include <stdlib.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>

#include <nuttx/kmalloc.h>
Expand Down
1 change: 0 additions & 1 deletion arch/risc-v/src/common/riscv_swint.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <string.h>
#include <assert.h>
#include <debug.h>
#include <syscall.h>

#include <arch/irq.h>
#include <nuttx/addrenv.h>
Expand Down
2 changes: 0 additions & 2 deletions arch/risc-v/src/esp32c3-legacy/esp32c3_ice40.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@

#include "esp32c3_gpio.h"

#include <nuttx/spi/ice40.h>

/****************************************************************************
* Private Function Prototypes
****************************************************************************/
Expand Down
Loading

0 comments on commit 610782f

Please sign in to comment.