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>
2026-06-13 15:03:58 +03:00 · 2024-05-01 19:31:05 -06:00
parent 9dea8fed8a
commit 8db017c891
46 changed files with 10 additions and 46 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>