Skip to content

Commit d477f60

Browse files
robherringjoergroedel
authored andcommitted
iommu: 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. Signed-off-by: Rob Herring <[email protected]> Acked-by: Robin Murphy <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent 6b7867b commit d477f60

File tree

7 files changed

+5
-7
lines changed

7 files changed

+5
-7
lines changed

drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
44
*/
55

6-
#include <linux/of_device.h>
6+
#include <linux/device.h>
77
#include <linux/firmware/qcom/qcom_scm.h>
88
#include <linux/ratelimit.h>
99

drivers/iommu/arm/arm-smmu/arm-smmu.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include <linux/module.h>
3030
#include <linux/of.h>
3131
#include <linux/of_address.h>
32-
#include <linux/of_device.h>
3332
#include <linux/pci.h>
3433
#include <linux/platform_device.h>
3534
#include <linux/pm_runtime.h>

drivers/iommu/arm/arm-smmu/qcom_iommu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
#include <linux/init.h>
2323
#include <linux/mutex.h>
2424
#include <linux/of.h>
25-
#include <linux/of_address.h>
26-
#include <linux/of_device.h>
25+
#include <linux/of_platform.h>
2726
#include <linux/platform_device.h>
2827
#include <linux/pm.h>
2928
#include <linux/pm_runtime.h>

drivers/iommu/ipmmu-vmsa.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <linux/io-pgtable.h>
1818
#include <linux/iommu.h>
1919
#include <linux/of.h>
20-
#include <linux/of_device.h>
2120
#include <linux/of_platform.h>
2221
#include <linux/platform_device.h>
2322
#include <linux/sizes.h>

drivers/iommu/sprd-iommu.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/mfd/syscon.h>
1515
#include <linux/module.h>
1616
#include <linux/of_platform.h>
17+
#include <linux/platform_device.h>
1718
#include <linux/regmap.h>
1819
#include <linux/slab.h>
1920

drivers/iommu/tegra-smmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <linux/iommu.h>
1010
#include <linux/kernel.h>
1111
#include <linux/of.h>
12-
#include <linux/of_device.h>
12+
#include <linux/of_platform.h>
1313
#include <linux/pci.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/slab.h>

drivers/iommu/virtio-iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/interval_tree.h>
1414
#include <linux/iommu.h>
1515
#include <linux/module.h>
16-
#include <linux/of_platform.h>
16+
#include <linux/of.h>
1717
#include <linux/pci.h>
1818
#include <linux/virtio.h>
1919
#include <linux/virtio_config.h>

0 commit comments

Comments
 (0)