Skip to content

Commit c925cfa

Browse files
robherringbjorn-helgaas
authored andcommitted
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>
1 parent c00f94a commit c925cfa

28 files changed

+25
-36
lines changed

drivers/pci/controller/cadence/pci-j721e.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include <linux/irqdomain.h>
1515
#include <linux/mfd/syscon.h>
1616
#include <linux/of.h>
17-
#include <linux/of_device.h>
1817
#include <linux/pci.h>
18+
#include <linux/platform_device.h>
1919
#include <linux/pm_runtime.h>
2020
#include <linux/regmap.h>
2121

drivers/pci/controller/cadence/pcie-cadence-plat.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
* Author: Tom Joseph <tjoseph@cadence.com>
77
*/
88
#include <linux/kernel.h>
9-
#include <linux/of_address.h>
9+
#include <linux/of.h>
1010
#include <linux/of_pci.h>
1111
#include <linux/platform_device.h>
1212
#include <linux/pm_runtime.h>
13-
#include <linux/of_device.h>
1413
#include "pcie-cadence.h"
1514

1615
#define CDNS_PLAT_CPU_TO_BUS_ADDR 0x0FFFFFFF

drivers/pci/controller/cadence/pcie-cadence.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// Author: Cyrille Pitchen <cyrille.pitchen@free-electrons.com>
55

66
#include <linux/kernel.h>
7+
#include <linux/of.h>
78

89
#include "pcie-cadence.h"
910

drivers/pci/controller/dwc/pci-dra7xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/irqdomain.h>
1717
#include <linux/kernel.h>
1818
#include <linux/module.h>
19-
#include <linux/of_device.h>
19+
#include <linux/of.h>
2020
#include <linux/of_gpio.h>
2121
#include <linux/of_pci.h>
2222
#include <linux/pci.h>

drivers/pci/controller/dwc/pci-exynos.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
#include <linux/interrupt.h>
1515
#include <linux/kernel.h>
1616
#include <linux/init.h>
17-
#include <linux/of_device.h>
1817
#include <linux/pci.h>
1918
#include <linux/platform_device.h>
2019
#include <linux/phy/phy.h>
2120
#include <linux/regulator/consumer.h>
21+
#include <linux/mod_devicetable.h>
2222
#include <linux/module.h>
2323

2424
#include "pcie-designware.h"

drivers/pci/controller/dwc/pci-imx6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
1818
#include <linux/mfd/syscon/imx7-iomuxc-gpr.h>
1919
#include <linux/module.h>
20+
#include <linux/of.h>
2021
#include <linux/of_gpio.h>
21-
#include <linux/of_device.h>
2222
#include <linux/of_address.h>
2323
#include <linux/pci.h>
2424
#include <linux/platform_device.h>

drivers/pci/controller/dwc/pci-keystone.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/mfd/syscon.h>
2020
#include <linux/msi.h>
2121
#include <linux/of.h>
22-
#include <linux/of_device.h>
2322
#include <linux/of_irq.h>
2423
#include <linux/of_pci.h>
2524
#include <linux/phy/phy.h>

drivers/pci/controller/dwc/pci-meson.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
#include <linux/clk.h>
1010
#include <linux/delay.h>
1111
#include <linux/gpio/consumer.h>
12-
#include <linux/of_device.h>
1312
#include <linux/of_gpio.h>
1413
#include <linux/pci.h>
1514
#include <linux/platform_device.h>
1615
#include <linux/reset.h>
1716
#include <linux/resource.h>
1817
#include <linux/types.h>
1918
#include <linux/phy/phy.h>
19+
#include <linux/mod_devicetable.h>
2020
#include <linux/module.h>
2121

2222
#include "pcie-designware.h"

drivers/pci/controller/dwc/pcie-artpec6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/delay.h>
1111
#include <linux/kernel.h>
1212
#include <linux/init.h>
13-
#include <linux/of_device.h>
13+
#include <linux/of.h>
1414
#include <linux/pci.h>
1515
#include <linux/platform_device.h>
1616
#include <linux/resource.h>

drivers/pci/controller/dwc/pcie-designware-plat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/interrupt.h>
1313
#include <linux/kernel.h>
1414
#include <linux/init.h>
15-
#include <linux/of_device.h>
15+
#include <linux/of.h>
1616
#include <linux/pci.h>
1717
#include <linux/platform_device.h>
1818
#include <linux/resource.h>

0 commit comments

Comments
 (0)