Skip to content

Commit 5b45759

Browse files
robherringarndb
authored andcommitted
firmware: 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. Acked-by: Dinh Nguyen <dinguyen@kernel.org> Acked-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Link: https://lore.kernel.org/r/20230803-dt-header-cleanups-for-soc-v2-17-d8de2cc88bff@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 53c5ae6 commit 5b45759

10 files changed

Lines changed: 9 additions & 8 deletions

File tree

drivers/firmware/arm_scmi/driver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include <linux/hashtable.h>
2929
#include <linux/list.h>
3030
#include <linux/module.h>
31-
#include <linux/of_address.h>
32-
#include <linux/of_device.h>
31+
#include <linux/of.h>
32+
#include <linux/platform_device.h>
3333
#include <linux/processor.h>
3434
#include <linux/refcount.h>
3535
#include <linux/slab.h>

drivers/firmware/imx/imx-dsp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <linux/kernel.h>
1111
#include <linux/mailbox_client.h>
1212
#include <linux/module.h>
13-
#include <linux/of_platform.h>
1413
#include <linux/platform_device.h>
1514
#include <linux/slab.h>
1615

drivers/firmware/imx/imx-scu-irq.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/firmware/imx/ipc.h>
1111
#include <linux/firmware/imx/sci.h>
1212
#include <linux/mailbox_client.h>
13+
#include <linux/of.h>
1314
#include <linux/suspend.h>
1415

1516
#define IMX_SC_IRQ_FUNC_ENABLE 1

drivers/firmware/imx/imx-scu.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/mailbox_client.h>
1717
#include <linux/module.h>
1818
#include <linux/mutex.h>
19+
#include <linux/of.h>
1920
#include <linux/of_platform.h>
2021
#include <linux/platform_device.h>
2122

drivers/firmware/mtk-adsp-ipc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <linux/kernel.h>
99
#include <linux/mailbox_client.h>
1010
#include <linux/module.h>
11-
#include <linux/of_platform.h>
1211
#include <linux/platform_device.h>
1312
#include <linux/slab.h>
1413

drivers/firmware/raspberrypi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/kref.h>
1111
#include <linux/mailbox_client.h>
1212
#include <linux/module.h>
13+
#include <linux/of.h>
1314
#include <linux/of_platform.h>
1415
#include <linux/platform_device.h>
1516
#include <linux/slab.h>

drivers/firmware/scpi_pm_domain.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
#include <linux/err.h>
99
#include <linux/io.h>
1010
#include <linux/module.h>
11-
#include <linux/of_platform.h>
11+
#include <linux/of.h>
12+
#include <linux/platform_device.h>
1213
#include <linux/pm_domain.h>
1314
#include <linux/scpi_protocol.h>
1415

drivers/firmware/stratix10-rsu.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <linux/module.h>
1111
#include <linux/mutex.h>
1212
#include <linux/of.h>
13-
#include <linux/of_platform.h>
1413
#include <linux/platform_device.h>
1514
#include <linux/firmware/intel/stratix10-svc-client.h>
1615
#include <linux/string.h>

drivers/firmware/tegra/bpmp.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
#include <linux/mailbox_client.h>
99
#include <linux/module.h>
1010
#include <linux/of.h>
11-
#include <linux/of_address.h>
12-
#include <linux/of_device.h>
11+
#include <linux/of_platform.h>
1312
#include <linux/platform_device.h>
1413
#include <linux/pm.h>
1514
#include <linux/semaphore.h>

drivers/firmware/xilinx/zynqmp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <linux/module.h>
1919
#include <linux/of.h>
2020
#include <linux/of_platform.h>
21+
#include <linux/platform_device.h>
2122
#include <linux/slab.h>
2223
#include <linux/uaccess.h>
2324
#include <linux/hashtable.h>

0 commit comments

Comments
 (0)