From 8db017c891420fe161e478feb63460e41ef0a5d5 Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@konsulko.com> Date: Wed, 1 May 2024 19:31:05 -0600 Subject: [PATCH] pci: Remove <common.h> and add needed includes Remove <common.h> from this driver directory and when needed add missing include files directly. Reviewed-by: Heiko Schocher <hs@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com> --- drivers/pci/pci-aardvark.c | 1 - drivers/pci/pci-emul-uclass.c | 1 - drivers/pci/pci-rcar-gen2.c | 2 +- drivers/pci/pci-rcar-gen3.c | 1 - drivers/pci/pci-uclass.c | 1 - drivers/pci/pci_auto.c | 2 +- drivers/pci/pci_auto_common.c | 1 - drivers/pci/pci_common.c | 1 - drivers/pci/pci_compat.c | 1 - drivers/pci/pci_ftpci100.c | 1 - drivers/pci/pci_mpc85xx.c | 1 - drivers/pci/pci_mvebu.c | 1 - drivers/pci/pci_rom.c | 2 +- drivers/pci/pci_sandbox.c | 1 - drivers/pci/pci_sh7751.c | 2 +- drivers/pci/pci_tegra.c | 1 - drivers/pci/pci_x86.c | 1 - drivers/pci/pcie_apple.c | 1 - drivers/pci/pcie_brcmstb.c | 1 - drivers/pci/pcie_dw_common.c | 1 - drivers/pci/pcie_dw_meson.c | 1 - drivers/pci/pcie_dw_mvebu.c | 3 ++- drivers/pci/pcie_dw_rockchip.c | 1 - drivers/pci/pcie_dw_sifive.c | 1 - drivers/pci/pcie_dw_ti.c | 1 - drivers/pci/pcie_ecam_generic.c | 1 - drivers/pci/pcie_ecam_synquacer.c | 1 - drivers/pci/pcie_fsl.c | 2 +- drivers/pci/pcie_fsl_fixup.c | 1 - drivers/pci/pcie_imx.c | 1 - drivers/pci/pcie_intel_fpga.c | 1 - drivers/pci/pcie_iproc.c | 1 - drivers/pci/pcie_layerscape.c | 1 - drivers/pci/pcie_layerscape_ep.c | 2 +- drivers/pci/pcie_layerscape_fixup.c | 1 - drivers/pci/pcie_layerscape_fixup_common.c | 2 +- drivers/pci/pcie_layerscape_gen4.c | 2 +- drivers/pci/pcie_layerscape_gen4_fixup.c | 1 - drivers/pci/pcie_layerscape_rc.c | 1 - drivers/pci/pcie_mediatek.c | 1 - drivers/pci/pcie_phytium.c | 1 - drivers/pci/pcie_plda_common.c | 1 - drivers/pci/pcie_rockchip.c | 1 - drivers/pci/pcie_starfive_jh7110.c | 1 - drivers/pci/pcie_uniphier.c | 1 - drivers/pci/pcie_xilinx.c | 1 - 46 files changed, 10 insertions(+), 46 deletions(-) diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c index af0e55cd2f..f5db4bdb76 100644 --- a/drivers/pci/pci-aardvark.c +++ b/drivers/pci/pci-aardvark.c @@ -25,7 +25,6 @@ * */ -#include <common.h> #include <dm.h> #include <pci.h> #include <asm/io.h> diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c index a0b8afb87a..166ee9fcd4 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -4,7 +4,6 @@ * Written by Simon Glass <sjg@chromium.org> */ -#include <common.h> #include <dm.h> #include <fdtdec.h> #include <log.h> diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c index b81eb35368..12c31e7408 100644 --- a/drivers/pci/pci-rcar-gen2.c +++ b/drivers/pci/pci-rcar-gen2.c @@ -5,7 +5,7 @@ * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com> */ -#include <common.h> +#include <config.h> #include <asm/io.h> #include <clk.h> #include <dm.h> diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c index 1252ef74c5..76878246f1 100644 --- a/drivers/pci/pci-rcar-gen3.c +++ b/drivers/pci/pci-rcar-gen3.c @@ -15,7 +15,6 @@ * Author: Phil Edworthy <phil.edworthy@renesas.com> */ -#include <common.h> #include <asm/io.h> #include <clk.h> #include <dm.h> diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 1a48256de0..6571e65304 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -6,7 +6,6 @@ #define LOG_CATEGORY UCLASS_PCI -#include <common.h> #include <dm.h> #include <errno.h> #include <init.h> diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index 01230360ba..90f8188644 100644 --- a/drivers/pci/pci_auto.c +++ b/drivers/pci/pci_auto.c @@ -8,7 +8,7 @@ * Copyright (c) 2021 Maciej W. Rozycki <macro@orcam.me.uk> */ -#include <common.h> +#include <config.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index 2f4aff0104..cfa818ed82 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -11,7 +11,6 @@ * Written by Simon Glass <sjg@chromium.org> */ -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index a18251297f..a57cf11cc5 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -9,7 +9,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <common.h> #include <dm.h> #include <env.h> #include <errno.h> diff --git a/drivers/pci/pci_compat.c b/drivers/pci/pci_compat.c index 9dddca8efe..8233925e52 100644 --- a/drivers/pci/pci_compat.c +++ b/drivers/pci/pci_compat.c @@ -4,7 +4,6 @@ * * Copyright (C) 2014 Google, Inc */ -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/pci/pci_ftpci100.c b/drivers/pci/pci_ftpci100.c index a177544500..43275b3d6a 100644 --- a/drivers/pci/pci_ftpci100.c +++ b/drivers/pci/pci_ftpci100.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -#include <common.h> #include <pci.h> #include <dm.h> #include <asm/io.h> diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c index 249cfe6646..c07feba797 100644 --- a/drivers/pci/pci_mpc85xx.c +++ b/drivers/pci/pci_mpc85xx.c @@ -4,7 +4,6 @@ * Heiko Schocher, DENX Software Engineering, hs@denx.de. * */ -#include <common.h> #include <asm/bitops.h> #include <pci.h> #include <dm.h> diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c index 83559550e6..77815513b7 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -10,7 +10,6 @@ * Pali Rohár <pali@kernel.org> */ -#include <common.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 438583aa01..78e5de937c 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -24,7 +24,6 @@ #define LOG_CATEGORY UCLASS_PCI -#include <common.h> #include <bios_emul.h> #include <bloblist.h> #include <bootstage.h> @@ -36,6 +35,7 @@ #include <pci.h> #include <pci_rom.h> #include <spl.h> +#include <time.h> #include <vesa.h> #include <video.h> #include <acpi/acpi_s3.h> diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index ca44d00237..fed0850458 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -4,7 +4,6 @@ * Written by Simon Glass <sjg@chromium.org> */ -#include <common.h> #include <dm.h> #include <fdtdec.h> #include <log.h> diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c index c1be56ce7a..3cd01e9b94 100644 --- a/drivers/pci/pci_sh7751.c +++ b/drivers/pci/pci_sh7751.c @@ -5,7 +5,7 @@ * (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> */ -#include <common.h> +#include <config.h> #include <dm.h> #include <pci.h> #include <asm/processor.h> diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index d6374a58e3..bb8832c6ab 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -11,7 +11,6 @@ #define pr_fmt(fmt) "tegra-pcie: " fmt -#include <common.h> #include <clk.h> #include <dm.h> #include <errno.h> diff --git a/drivers/pci/pci_x86.c b/drivers/pci/pci_x86.c index 8d036930e7..ab76166451 100644 --- a/drivers/pci/pci_x86.c +++ b/drivers/pci/pci_x86.c @@ -3,7 +3,6 @@ * Copyright (c) 2015 Google, Inc */ -#include <common.h> #include <dm.h> #include <pci.h> #include <asm/pci.h> diff --git a/drivers/pci/pcie_apple.c b/drivers/pci/pcie_apple.c index 21bafba3b0..6a8e715d4b 100644 --- a/drivers/pci/pcie_apple.c +++ b/drivers/pci/pcie_apple.c @@ -16,7 +16,6 @@ * Author: Marc Zyngier <maz@kernel.org> */ -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <dm/devres.h> diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c index cd45f0bee9..f978c64365 100644 --- a/drivers/pci/pcie_brcmstb.c +++ b/drivers/pci/pcie_brcmstb.c @@ -12,7 +12,6 @@ * Copyright (C) 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de> */ -#include <common.h> #include <errno.h> #include <dm.h> #include <dm/ofnode.h> diff --git a/drivers/pci/pcie_dw_common.c b/drivers/pci/pcie_dw_common.c index 74fb6df412..0673e516c6 100644 --- a/drivers/pci/pcie_dw_common.c +++ b/drivers/pci/pcie_dw_common.c @@ -8,7 +8,6 @@ * Copyright (C) 2018 Texas Instruments, Inc */ -#include <common.h> #include <dm.h> #include <log.h> #include <pci.h> diff --git a/drivers/pci/pcie_dw_meson.c b/drivers/pci/pcie_dw_meson.c index f953797908..bb78e7874b 100644 --- a/drivers/pci/pcie_dw_meson.c +++ b/drivers/pci/pcie_dw_meson.c @@ -9,7 +9,6 @@ * Copyright (c) 2021 Rockchip, Inc. */ -#include <common.h> #include <clk.h> #include <dm.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c index c41f3f1530..43b919175c 100644 --- a/drivers/pci/pcie_dw_mvebu.c +++ b/drivers/pci/pcie_dw_mvebu.c @@ -10,10 +10,11 @@ * - drivers/pci/pcie_xilinx.c */ -#include <common.h> +#include <config.h> #include <dm.h> #include <log.h> #include <pci.h> +#include <time.h> #include <asm/global_data.h> #include <asm/io.h> #include <asm-generic/gpio.h> diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index bc4635f671..1bad51fb3e 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -5,7 +5,6 @@ * Copyright (c) 2021 Rockchip, Inc. */ -#include <common.h> #include <clk.h> #include <dm.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_dw_sifive.c b/drivers/pci/pcie_dw_sifive.c index fac3f18237..6285edf4b0 100644 --- a/drivers/pci/pcie_dw_sifive.c +++ b/drivers/pci/pcie_dw_sifive.c @@ -14,7 +14,6 @@ #include <asm/io.h> #include <asm-generic/gpio.h> #include <clk.h> -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c index 4195a02de3..78a5d03586 100644 --- a/drivers/pci/pcie_dw_ti.c +++ b/drivers/pci/pcie_dw_ti.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Texas Instruments, Inc */ -#include <common.h> #include <dm.h> #include <log.h> #include <pci.h> diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c index f5bc6e3d92..3cb2bbbccb 100644 --- a/drivers/pci/pcie_ecam_generic.c +++ b/drivers/pci/pcie_ecam_generic.c @@ -7,7 +7,6 @@ * Copyright (C) 2016 Imagination Technologies */ -#include <common.h> #include <dm.h> #include <pci.h> #include <linux/ioport.h> diff --git a/drivers/pci/pcie_ecam_synquacer.c b/drivers/pci/pcie_ecam_synquacer.c index e3e2289108..fc855dfca4 100644 --- a/drivers/pci/pcie_ecam_synquacer.c +++ b/drivers/pci/pcie_ecam_synquacer.c @@ -8,7 +8,6 @@ * Copyright (C) 2021 Linaro Ltd. */ -#include <common.h> #include <dm.h> #include <pci.h> #include <log.h> diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c index ec917ee7d5..18af23c950 100644 --- a/drivers/pci/pcie_fsl.c +++ b/drivers/pci/pcie_fsl.c @@ -6,7 +6,7 @@ * Author: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> */ -#include <common.h> +#include <config.h> #include <dm.h> #include <malloc.h> #include <mapmem.h> diff --git a/drivers/pci/pcie_fsl_fixup.c b/drivers/pci/pcie_fsl_fixup.c index f4e227895d..9187e7af74 100644 --- a/drivers/pci/pcie_fsl_fixup.c +++ b/drivers/pci/pcie_fsl_fixup.c @@ -6,7 +6,6 @@ * Author: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> */ -#include <common.h> #ifdef CONFIG_OF_BOARD_SETUP #include <dm.h> #include <fdt_support.h> diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 78f2c7d6bc..11c4ccbfc5 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -17,7 +17,6 @@ * those too in order to have a single modern PCIe iMX driver. */ -#include <common.h> #include <init.h> #include <log.h> #include <malloc.h> diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c index 60195cfe1b..959fd36908 100644 --- a/drivers/pci/pcie_intel_fpga.c +++ b/drivers/pci/pcie_intel_fpga.c @@ -6,7 +6,6 @@ * */ -#include <common.h> #include <dm.h> #include <pci.h> #include <asm/global_data.h> diff --git a/drivers/pci/pcie_iproc.c b/drivers/pci/pcie_iproc.c index d6d3a9e202..360ef1b011 100644 --- a/drivers/pci/pcie_iproc.c +++ b/drivers/pci/pcie_iproc.c @@ -4,7 +4,6 @@ * */ -#include <common.h> #include <dm.h> #include <errno.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c index 3c7c4ca18e..1be33095b9 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -5,7 +5,6 @@ * Layerscape PCIe driver */ -#include <common.h> #include <log.h> #include <asm/global_data.h> #include <asm/io.h> diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c index 83f7eebd62..3520488b34 100644 --- a/drivers/pci/pcie_layerscape_ep.c +++ b/drivers/pci/pcie_layerscape_ep.c @@ -4,7 +4,7 @@ * Layerscape PCIe EP driver */ -#include <common.h> +#include <config.h> #include <asm/arch/fsl_serdes.h> #include <dm.h> #include <asm/global_data.h> diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index c519835395..ec4a7e7b65 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -5,7 +5,6 @@ * Layerscape PCIe driver */ -#include <common.h> #include <dm.h> #include <init.h> #include <log.h> diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c index 095874a927..f37e37f6b1 100644 --- a/drivers/pci/pcie_layerscape_fixup_common.c +++ b/drivers/pci/pcie_layerscape_fixup_common.c @@ -7,10 +7,10 @@ * */ -#include <common.h> #include <init.h> #include <asm/arch/clock.h> #include <asm/arch/soc.h> +#include <linux/errno.h> #include <linux/libfdt.h> #include <fdt_support.h> #include "pcie_layerscape_fixup_common.h" diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c index 021c975869..57dc91f2fa 100644 --- a/drivers/pci/pcie_layerscape_gen4.c +++ b/drivers/pci/pcie_layerscape_gen4.c @@ -6,7 +6,7 @@ * Author: Hou Zhiqiang <Minder.Hou@gmail.com> */ -#include <common.h> +#include <config.h> #include <log.h> #include <asm/arch/fsl_serdes.h> #include <pci.h> diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c index b2a45bf105..60c4338bcd 100644 --- a/drivers/pci/pcie_layerscape_gen4_fixup.c +++ b/drivers/pci/pcie_layerscape_gen4_fixup.c @@ -7,7 +7,6 @@ * */ -#include <common.h> #include <dm.h> #include <log.h> #include <pci.h> diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c index 6a5bf88da2..e7913d43a8 100644 --- a/drivers/pci/pcie_layerscape_rc.c +++ b/drivers/pci/pcie_layerscape_rc.c @@ -4,7 +4,6 @@ * Layerscape PCIe driver */ -#include <common.h> #include <asm/arch/fsl_serdes.h> #include <pci.h> #include <asm/global_data.h> diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c index f0f34b5d11..04d8cc29af 100644 --- a/drivers/pci/pcie_mediatek.c +++ b/drivers/pci/pcie_mediatek.c @@ -7,7 +7,6 @@ * Honghui Zhang <honghui.zhang@mediatek.com> */ -#include <common.h> #include <clk.h> #include <dm.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c index 3bd1f5cd6d..94de89bcad 100644 --- a/drivers/pci/pcie_phytium.c +++ b/drivers/pci/pcie_phytium.c @@ -7,7 +7,6 @@ * Copyright (C) 2019 */ -#include <common.h> #include <dm.h> #include <pci.h> #include <asm/global_data.h> diff --git a/drivers/pci/pcie_plda_common.c b/drivers/pci/pcie_plda_common.c index cd74bb4711..622a5cee10 100644 --- a/drivers/pci/pcie_plda_common.c +++ b/drivers/pci/pcie_plda_common.c @@ -6,7 +6,6 @@ * */ -#include <common.h> #include <clk.h> #include <dm.h> #include <pci.h> diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c index 624841e9d8..19f9e58a64 100644 --- a/drivers/pci/pcie_rockchip.c +++ b/drivers/pci/pcie_rockchip.c @@ -11,7 +11,6 @@ * Bits taken from Linux Rockchip PCIe host controller. */ -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_starfive_jh7110.c b/drivers/pci/pcie_starfive_jh7110.c index 903a544d37..569fbfd35c 100644 --- a/drivers/pci/pcie_starfive_jh7110.c +++ b/drivers/pci/pcie_starfive_jh7110.c @@ -7,7 +7,6 @@ * */ -#include <common.h> #include <clk.h> #include <dm.h> #include <pci.h> diff --git a/drivers/pci/pcie_uniphier.c b/drivers/pci/pcie_uniphier.c index f2edea9899..d1170b576b 100644 --- a/drivers/pci/pcie_uniphier.c +++ b/drivers/pci/pcie_uniphier.c @@ -5,7 +5,6 @@ */ #include <clk.h> -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c index 3db460b5f9..a674ab04be 100644 --- a/drivers/pci/pcie_xilinx.c +++ b/drivers/pci/pcie_xilinx.c @@ -5,7 +5,6 @@ * Copyright (C) 2016 Imagination Technologies */ -#include <common.h> #include <dm.h> #include <pci.h> #include <linux/bitops.h> -- 2.39.5