global: Drop common.h inclusion

In order to make it easier to move on to dropping common.h from code directly, remove common.h inclusion from the rest of the header file which had been including it. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com>
2024-11-10 07:04:28 +00:00 · 2023-12-14 13:16:47 -05:00 · 2023-12-14 13:16:47 -05:00 · cb3ce95401
commit cb3ce95401
parent 460b2c068c
31 changed files with 7 additions and 40 deletions
--- a/board/BuR/common/br_resetc.h
+++ b/board/BuR/common/br_resetc.h
@ -7,7 +7,6 @@
 */
 #ifndef __CONFIG_BRRESETC_H__
 #define __CONFIG_BRRESETC_H__
-#include <common.h>

 int br_resetc_regget(u8 reg, u8 *dst);
 int br_resetc_regset(u8 reg, u8 val);
--- a/board/CZ.NIC/turris_mox/mox_sp.h
+++ b/board/CZ.NIC/turris_mox/mox_sp.h
@ -6,8 +6,6 @@
 #ifndef _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_
 #define _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_

-#include <common.h>
-
 enum cznic_a3720_board {
 	BOARD_UNDEFINED		= 0x0,
 	BOARD_TURRIS_MOX	= 0x1,
--- a/board/freescale/common/vsc3316_3308.h
+++ b/board/freescale/common/vsc3316_3308.h
@ -6,7 +6,6 @@
 #ifndef __VSC_CROSSBAR_H_
 #define __VSC_CROSSBAR_H_

-#include <common.h>
 #include <i2c.h>
 #include <errno.h>

--- a/board/ti/ks2_evm/mux-k2g.h
+++ b/board/ti/ks2_evm/mux-k2g.h
@ -6,7 +6,6 @@
 *     Texas Instruments Incorporated, <www.ti.com>
 */

-#include <common.h>
 #include <hang.h>
 #include <asm/io.h>
 #include <asm/arch/mux-k2g.h>
--- a/board/tq/tqma6/tqma6_bb.h
+++ b/board/tq/tqma6/tqma6_bb.h
@ -7,8 +7,6 @@
 #ifndef __TQMA6_BB__
 #define __TQMA6_BB__

-#include <common.h>
-
 int tqma6_bb_board_mmc_getwp(struct mmc *mmc);
 int tqma6_bb_board_mmc_getcd(struct mmc *mmc);
 int tqma6_bb_board_mmc_init(struct bd_info *bis);
--- a/board/xilinx/zynqmp/xil_io.h
+++ b/board/xilinx/zynqmp/xil_io.h
@ -5,7 +5,6 @@

 /* FIXME remove this when vivado is fixed */
 #include <asm/io.h>
-#include <common.h>
 #include <linux/delay.h>

 #define xil_printf(...)
--- a/disk/part_amiga.h
+++ b/disk/part_amiga.h
@ -7,7 +7,6 @@

 #ifndef _DISK_PART_AMIGA_H
 #define _DISK_PART_AMIGA_H
-#include <common.h>

 #if CONFIG_IS_ENABLED(ISO_PARTITION)
 /* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS
--- a/drivers/bios_emulator/include/x86emu.h
+++ b/drivers/bios_emulator/include/x86emu.h
@ -42,7 +42,6 @@
 #define __X86EMU_X86EMU_H

 #include <asm/types.h>
-#include <common.h>
 #include <pci.h>
 #include <asm/io.h>
 #define X86API
--- a/drivers/crypto/fsl/jobdesc.h
+++ b/drivers/crypto/fsl/jobdesc.h
@ -7,7 +7,6 @@
 #ifndef __JOBDESC_H
 #define __JOBDESC_H

-#include <common.h>
 #include <asm/io.h>
 #include "rsa_caam.h"

--- a/drivers/crypto/fsl/rsa_caam.h
+++ b/drivers/crypto/fsl/rsa_caam.h
@ -6,8 +6,6 @@
 #ifndef __RSA_CAAM_H
 #define __RSA_CAAM_H

-#include <common.h>
-
 /**
 * struct pk_in_params - holder for input to PKHA block in CAAM
 * These parameters are required to perform Modular Exponentiation
--- a/drivers/ddr/altera/sdram_soc64.h
+++ b/drivers/ddr/altera/sdram_soc64.h
@ -6,7 +6,6 @@
 #ifndef	_SDRAM_SOC64_H_
 #define	_SDRAM_SOC64_H_

-#include <common.h>
 #include <linux/sizes.h>

 struct altera_sdram_priv {
--- a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
+++ b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
@ -6,7 +6,6 @@
 #ifndef _DDR_ML_WRAPPER_H
 #define _DDR_ML_WRAPPER_H

-#include <common.h>
 #include <i2c.h>
 #include <spl.h>
 #include <asm/io.h>
--- a/drivers/net/fm/fm.h
+++ b/drivers/net/fm/fm.h
@ -6,7 +6,6 @@
 #ifndef __FM_H__
 #define __FM_H__

-#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <fsl_fman.h>
--- a/drivers/net/fsl-mc/dpio/qbman_private.h
+++ b/drivers/net/fsl-mc/dpio/qbman_private.h
@ -4,7 +4,6 @@
 */

 /* Perform extra checking */
-#include <common.h>
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/bug.h>
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@ -20,6 +20,7 @@

 /* Trace the 3 different classes of read/write access to QBMan. #undef as
 * required. */
+#include <config.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
 #undef QBMAN_CCSR_TRACE
--- a/drivers/net/mscc_eswitch/mscc_mac_table.c
+++ b/drivers/net/mscc_eswitch/mscc_mac_table.c
@ -3,6 +3,7 @@
 * Copyright (c) 2018 Microsemi Corporation
 */

+#include <errno.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include "mscc_mac_table.h"
--- a/drivers/net/mscc_eswitch/mscc_mac_table.h
+++ b/drivers/net/mscc_eswitch/mscc_mac_table.h
@ -3,8 +3,6 @@
 * Copyright (c) 2018 Microsemi Corporation
 */

-#include <common.h>
-
 #define ETH_LEN 6
 #define MAC_VID 1

--- a/drivers/net/mscc_eswitch/mscc_xfer.c
+++ b/drivers/net/mscc_eswitch/mscc_xfer.c
@ -3,6 +3,7 @@
 * Copyright (c) 2018 Microsemi Corporation
 */

+#include <errno.h>
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
--- a/drivers/net/mscc_eswitch/mscc_xfer.h
+++ b/drivers/net/mscc_eswitch/mscc_xfer.h
@ -3,8 +3,6 @@
 * Copyright (c) 2018 Microsemi Corporation
 */

-#include <common.h>
-
 enum mscc_regs_qs {
 	MSCC_QS_XTR_RD,
 	MSCC_QS_XTR_FLUSH,
--- a/drivers/pci/pcie_layerscape_fixup_common.h
+++ b/drivers/pci/pcie_layerscape_fixup_common.h
@ -9,8 +9,6 @@
 #ifndef _PCIE_LAYERSCAPE_FIXUP_COMMON_H_
 #define _PCIE_LAYERSCAPE_FIXUP_COMMON_H_

-#include <common.h>
-
 void ft_pci_setup_ls(void *blob, struct bd_info *bd);

 #ifdef CONFIG_PCIE_LAYERSCAPE_GEN4
--- a/drivers/pci_endpoint/pcie-cadence.h
+++ b/drivers/pci_endpoint/pcie-cadence.h
@ -11,7 +11,6 @@
 #ifndef PCIE_CADENCE_H
 #define PCIE_CADENCE_H

-#include <common.h>
 #include <pci_ep.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
@ -8,8 +8,6 @@
 #ifndef _PINCTRL_MTMIPS_COMMON_H_
 #define _PINCTRL_MTMIPS_COMMON_H_

-#include <common.h>
-
 struct mtmips_pmx_func {
 	const char *name;
 	int value;
--- a/drivers/usb/gadget/bcm_udc_otg.h
+++ b/drivers/usb/gadget/bcm_udc_otg.h
@ -6,8 +6,6 @@
 #ifndef __BCM_UDC_OTG_H
 #define __BCM_UDC_OTG_H

-#include <common.h>
-
 static inline void wfld_set(uintptr_t addr, uint32_t fld_val, uint32_t fld_mask)
 {
 	writel(((readl(addr) & ~(fld_mask)) | (fld_val)), (addr));
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@ -9,7 +9,6 @@
 #ifndef __BTRFS_CTREE_H__
 #define __BTRFS_CTREE_H__

-#include <common.h>
 #include <compiler.h>
 #include <linux/rbtree.h>
 #include <linux/bug.h>
--- a/fs/yaffs2/ydirectenv.h
+++ b/fs/yaffs2/ydirectenv.h
@ -20,7 +20,6 @@
 #ifndef __YDIRECTENV_H__
 #define __YDIRECTENV_H__

-#include <common.h>
 #include <malloc.h>
 #include <linux/compat.h>

--- a/lib/libavb/avb_sysdeps.h
+++ b/lib/libavb/avb_sysdeps.h
@ -19,7 +19,9 @@ extern "C" {
 * like uint8_t, uint64_t, and bool (with |false|, |true| keywords)
 * must be present.
 */
-#include <common.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <linux/types.h>

 /* If you don't have gcc or clang, these attribute macros may need to
 * be adjusted.
--- a/lib/zlib/zlib.h
+++ b/lib/zlib/zlib.h
@ -2,7 +2,6 @@
 #ifndef __GLUE_ZLIB_H__
 #define __GLUE_ZLIB_H__

-#include <common.h>
 #include <linux/compiler.h>
 #include <asm/unaligned.h>
 #include <watchdog.h>
--- a/net/arp.h
+++ b/net/arp.h
@ -12,8 +12,6 @@
 #ifndef __ARP_H__
 #define __ARP_H__

-#include <common.h>
-
 extern struct in_addr net_arp_wait_packet_ip;
 /* MAC address of waiting packet's destination */
 extern uchar *arp_wait_packet_ethaddr;
--- a/net/link_local.h
+++ b/net/link_local.h
@ -10,15 +10,12 @@
 * Licensed under the GPL v2 or later
 */

-#if defined(CONFIG_CMD_LINK_LOCAL)
-
 #ifndef __LINK_LOCAL_H__
 #define __LINK_LOCAL_H__

-#include <common.h>
+struct arp_hdr;

 void link_local_receive_arp(struct arp_hdr *arp, int len);
 void link_local_start(void);

 #endif /* __LINK_LOCAL_H__ */
-#endif
--- a/net/net_rand.h
+++ b/net/net_rand.h
@ -9,7 +9,6 @@
 #ifndef __NET_RAND_H__
 #define __NET_RAND_H__

-#include <common.h>
 #include <dm/uclass.h>
 #include <rng.h>

--- a/net/ping.h
+++ b/net/ping.h
@ -12,7 +12,6 @@
 #ifndef __PING_H__
 #define __PING_H__

-#include <common.h>
 #include <net.h>

 /*