Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: Explicitly include correct DT includes

The DT of_device.h and of_platform.h date back to the separate
of_platform_bus_type before it as merged into the regular platform bus. As
part of that merge prepping Arm DT support 13 years ago, they "temporarily"
include each other. They also include platform_device.h and of.h. As a
result, there's a pretty much random mix of those include files used
throughout the tree. In order to detangle these headers and replace the
implicit includes with struct declarations, users need to explicitly
include the correct includes.

Link: https://lore.kernel.org/r/20230714174827.4061572-1-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

authored by

Rob Herring and committed by
Bjorn Helgaas
c925cfaf c00f94ad

+25 -36
+1 -1
drivers/pci/controller/cadence/pci-j721e.c
··· 14 14 #include <linux/irqdomain.h> 15 15 #include <linux/mfd/syscon.h> 16 16 #include <linux/of.h> 17 - #include <linux/of_device.h> 18 17 #include <linux/pci.h> 18 + #include <linux/platform_device.h> 19 19 #include <linux/pm_runtime.h> 20 20 #include <linux/regmap.h> 21 21
+1 -2
drivers/pci/controller/cadence/pcie-cadence-plat.c
··· 6 6 * Author: Tom Joseph <tjoseph@cadence.com> 7 7 */ 8 8 #include <linux/kernel.h> 9 - #include <linux/of_address.h> 9 + #include <linux/of.h> 10 10 #include <linux/of_pci.h> 11 11 #include <linux/platform_device.h> 12 12 #include <linux/pm_runtime.h> 13 - #include <linux/of_device.h> 14 13 #include "pcie-cadence.h" 15 14 16 15 #define CDNS_PLAT_CPU_TO_BUS_ADDR 0x0FFFFFFF
+1
drivers/pci/controller/cadence/pcie-cadence.c
··· 4 4 // Author: Cyrille Pitchen <cyrille.pitchen@free-electrons.com> 5 5 6 6 #include <linux/kernel.h> 7 + #include <linux/of.h> 7 8 8 9 #include "pcie-cadence.h" 9 10
+1 -1
drivers/pci/controller/dwc/pci-dra7xx.c
··· 16 16 #include <linux/irqdomain.h> 17 17 #include <linux/kernel.h> 18 18 #include <linux/module.h> 19 - #include <linux/of_device.h> 19 + #include <linux/of.h> 20 20 #include <linux/of_gpio.h> 21 21 #include <linux/of_pci.h> 22 22 #include <linux/pci.h>
+1 -1
drivers/pci/controller/dwc/pci-exynos.c
··· 14 14 #include <linux/interrupt.h> 15 15 #include <linux/kernel.h> 16 16 #include <linux/init.h> 17 - #include <linux/of_device.h> 18 17 #include <linux/pci.h> 19 18 #include <linux/platform_device.h> 20 19 #include <linux/phy/phy.h> 21 20 #include <linux/regulator/consumer.h> 21 + #include <linux/mod_devicetable.h> 22 22 #include <linux/module.h> 23 23 24 24 #include "pcie-designware.h"
+1 -1
drivers/pci/controller/dwc/pci-imx6.c
··· 17 17 #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> 18 18 #include <linux/mfd/syscon/imx7-iomuxc-gpr.h> 19 19 #include <linux/module.h> 20 + #include <linux/of.h> 20 21 #include <linux/of_gpio.h> 21 - #include <linux/of_device.h> 22 22 #include <linux/of_address.h> 23 23 #include <linux/pci.h> 24 24 #include <linux/platform_device.h>
-1
drivers/pci/controller/dwc/pci-keystone.c
··· 19 19 #include <linux/mfd/syscon.h> 20 20 #include <linux/msi.h> 21 21 #include <linux/of.h> 22 - #include <linux/of_device.h> 23 22 #include <linux/of_irq.h> 24 23 #include <linux/of_pci.h> 25 24 #include <linux/phy/phy.h>
+1 -1
drivers/pci/controller/dwc/pci-meson.c
··· 9 9 #include <linux/clk.h> 10 10 #include <linux/delay.h> 11 11 #include <linux/gpio/consumer.h> 12 - #include <linux/of_device.h> 13 12 #include <linux/of_gpio.h> 14 13 #include <linux/pci.h> 15 14 #include <linux/platform_device.h> ··· 16 17 #include <linux/resource.h> 17 18 #include <linux/types.h> 18 19 #include <linux/phy/phy.h> 20 + #include <linux/mod_devicetable.h> 19 21 #include <linux/module.h> 20 22 21 23 #include "pcie-designware.h"
+1 -1
drivers/pci/controller/dwc/pcie-artpec6.c
··· 10 10 #include <linux/delay.h> 11 11 #include <linux/kernel.h> 12 12 #include <linux/init.h> 13 - #include <linux/of_device.h> 13 + #include <linux/of.h> 14 14 #include <linux/pci.h> 15 15 #include <linux/platform_device.h> 16 16 #include <linux/resource.h>
+1 -1
drivers/pci/controller/dwc/pcie-designware-plat.c
··· 12 12 #include <linux/interrupt.h> 13 13 #include <linux/kernel.h> 14 14 #include <linux/init.h> 15 - #include <linux/of_device.h> 15 + #include <linux/of.h> 16 16 #include <linux/pci.h> 17 17 #include <linux/platform_device.h> 18 18 #include <linux/resource.h>
+1 -1
drivers/pci/controller/dwc/pcie-designware.c
··· 16 16 #include <linux/gpio/consumer.h> 17 17 #include <linux/ioport.h> 18 18 #include <linux/of.h> 19 - #include <linux/of_platform.h> 19 + #include <linux/platform_device.h> 20 20 #include <linux/sizes.h> 21 21 #include <linux/types.h> 22 22
+1 -1
drivers/pci/controller/dwc/pcie-dw-rockchip.c
··· 14 14 #include <linux/irqdomain.h> 15 15 #include <linux/mfd/syscon.h> 16 16 #include <linux/module.h> 17 - #include <linux/of_device.h> 17 + #include <linux/of.h> 18 18 #include <linux/of_irq.h> 19 19 #include <linux/phy/phy.h> 20 20 #include <linux/platform_device.h>
+2
drivers/pci/controller/dwc/pcie-intel-gw.c
··· 9 9 #include <linux/clk.h> 10 10 #include <linux/gpio/consumer.h> 11 11 #include <linux/iopoll.h> 12 + #include <linux/mod_devicetable.h> 12 13 #include <linux/pci_regs.h> 13 14 #include <linux/phy/phy.h> 14 15 #include <linux/platform_device.h> 16 + #include <linux/property.h> 15 17 #include <linux/reset.h> 16 18 17 19 #include "../../pci.h"
+1 -2
drivers/pci/controller/dwc/pcie-kirin.c
··· 16 16 #include <linux/gpio/consumer.h> 17 17 #include <linux/interrupt.h> 18 18 #include <linux/mfd/syscon.h> 19 - #include <linux/of_address.h> 20 - #include <linux/of_device.h> 19 + #include <linux/of.h> 21 20 #include <linux/of_gpio.h> 22 21 #include <linux/of_pci.h> 23 22 #include <linux/phy/phy.h>
+1 -1
drivers/pci/controller/dwc/pcie-qcom.c
··· 19 19 #include <linux/iopoll.h> 20 20 #include <linux/kernel.h> 21 21 #include <linux/init.h> 22 - #include <linux/of_device.h> 22 + #include <linux/of.h> 23 23 #include <linux/of_gpio.h> 24 24 #include <linux/pci.h> 25 25 #include <linux/pm_runtime.h>
-1
drivers/pci/controller/dwc/pcie-tegra194.c
··· 20 20 #include <linux/kernel.h> 21 21 #include <linux/module.h> 22 22 #include <linux/of.h> 23 - #include <linux/of_device.h> 24 23 #include <linux/of_gpio.h> 25 24 #include <linux/of_pci.h> 26 25 #include <linux/pci.h>
+1 -1
drivers/pci/controller/dwc/pcie-uniphier-ep.c
··· 11 11 #include <linux/delay.h> 12 12 #include <linux/init.h> 13 13 #include <linux/iopoll.h> 14 - #include <linux/of_device.h> 14 + #include <linux/of.h> 15 15 #include <linux/pci.h> 16 16 #include <linux/phy/phy.h> 17 17 #include <linux/platform_device.h>
-3
drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
··· 17 17 #include <linux/kernel.h> 18 18 #include <linux/module.h> 19 19 #include <linux/msi.h> 20 - #include <linux/of_address.h> 21 - #include <linux/of_irq.h> 22 - #include <linux/of_platform.h> 23 20 #include <linux/of_pci.h> 24 21 #include <linux/pci.h> 25 22 #include <linux/platform_device.h>
+1 -2
drivers/pci/controller/pci-ftpci100.c
··· 15 15 #include <linux/interrupt.h> 16 16 #include <linux/io.h> 17 17 #include <linux/kernel.h> 18 - #include <linux/of_address.h> 19 - #include <linux/of_device.h> 18 + #include <linux/of.h> 20 19 #include <linux/of_irq.h> 21 20 #include <linux/of_pci.h> 22 21 #include <linux/pci.h>
+1 -1
drivers/pci/controller/pci-host-common.c
··· 9 9 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 + #include <linux/of.h> 12 13 #include <linux/of_address.h> 13 - #include <linux/of_device.h> 14 14 #include <linux/of_pci.h> 15 15 #include <linux/pci-ecam.h> 16 16 #include <linux/platform_device.h>
+1 -2
drivers/pci/controller/pci-ixp4xx.c
··· 19 19 #include <linux/init.h> 20 20 #include <linux/io.h> 21 21 #include <linux/kernel.h> 22 - #include <linux/of_address.h> 23 - #include <linux/of_device.h> 22 + #include <linux/of.h> 24 23 #include <linux/of_pci.h> 25 24 #include <linux/pci.h> 26 25 #include <linux/platform_device.h>
+1 -1
drivers/pci/controller/pci-loongson.c
··· 5 5 * Copyright (C) 2020 Jiaxun Yang <jiaxun.yang@flygoat.com> 6 6 */ 7 7 8 - #include <linux/of_device.h> 8 + #include <linux/of.h> 9 9 #include <linux/of_pci.h> 10 10 #include <linux/pci.h> 11 11 #include <linux/pci_ids.h>
+1 -2
drivers/pci/controller/pci-v3-semi.c
··· 20 20 #include <linux/interrupt.h> 21 21 #include <linux/io.h> 22 22 #include <linux/kernel.h> 23 - #include <linux/of_address.h> 24 - #include <linux/of_device.h> 23 + #include <linux/of.h> 25 24 #include <linux/of_pci.h> 26 25 #include <linux/pci.h> 27 26 #include <linux/platform_device.h>
+2 -3
drivers/pci/controller/pcie-altera.c
··· 9 9 #include <linux/delay.h> 10 10 #include <linux/interrupt.h> 11 11 #include <linux/irqchip/chained_irq.h> 12 + #include <linux/irqdomain.h> 12 13 #include <linux/init.h> 13 14 #include <linux/module.h> 14 - #include <linux/of_address.h> 15 - #include <linux/of_device.h> 16 - #include <linux/of_irq.h> 15 + #include <linux/of.h> 17 16 #include <linux/of_pci.h> 18 17 #include <linux/pci.h> 19 18 #include <linux/platform_device.h>
+1 -3
drivers/pci/controller/pcie-rockchip-host.c
··· 24 24 #include <linux/kernel.h> 25 25 #include <linux/mfd/syscon.h> 26 26 #include <linux/module.h> 27 - #include <linux/of_address.h> 28 - #include <linux/of_device.h> 27 + #include <linux/of.h> 29 28 #include <linux/of_pci.h> 30 - #include <linux/of_platform.h> 31 29 #include <linux/pci.h> 32 30 #include <linux/pci_ids.h> 33 31 #include <linux/phy/phy.h>
+1
drivers/pci/controller/pcie-rockchip.c
··· 15 15 #include <linux/delay.h> 16 16 #include <linux/gpio/consumer.h> 17 17 #include <linux/iopoll.h> 18 + #include <linux/of.h> 18 19 #include <linux/of_pci.h> 19 20 #include <linux/phy/phy.h> 20 21 #include <linux/platform_device.h>
-1
drivers/pci/endpoint/pci-epc-core.c
··· 9 9 #include <linux/device.h> 10 10 #include <linux/slab.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 13 12 14 13 #include <linux/pci-epc.h> 15 14 #include <linux/pci-epf.h>
-1
drivers/pci/probe.c
··· 8 8 #include <linux/init.h> 9 9 #include <linux/pci.h> 10 10 #include <linux/msi.h> 11 - #include <linux/of_device.h> 12 11 #include <linux/of_pci.h> 13 12 #include <linux/pci_hotplug.h> 14 13 #include <linux/slab.h>