Skip to content

Commit 6484be9

Browse files
robherringandersson
authored andcommitted
soc: qcom: 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 <robh@kernel.org> Link: https://lore.kernel.org/r/20230714175142.4067795-1-robh@kernel.org Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 8ddfa81 commit 6484be9

11 files changed

Lines changed: 8 additions & 9 deletions

File tree

drivers/soc/qcom/cpr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/bitops.h>
1616
#include <linux/slab.h>
1717
#include <linux/of.h>
18-
#include <linux/of_device.h>
1918
#include <linux/platform_device.h>
2019
#include <linux/pm_domain.h>
2120
#include <linux/pm_opp.h>

drivers/soc/qcom/icc-bwmon.c

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

drivers/soc/qcom/ice.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
#include <linux/clk.h>
1212
#include <linux/delay.h>
1313
#include <linux/iopoll.h>
14+
#include <linux/of.h>
1415
#include <linux/of_platform.h>
16+
#include <linux/platform_device.h>
1517

1618
#include <linux/firmware/qcom/qcom_scm.h>
1719

drivers/soc/qcom/llcc-qcom.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/module.h>
1414
#include <linux/mutex.h>
1515
#include <linux/of.h>
16-
#include <linux/of_device.h>
1716
#include <linux/regmap.h>
1817
#include <linux/sizes.h>
1918
#include <linux/slab.h>

drivers/soc/qcom/ocmem.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#include <linux/io.h>
1515
#include <linux/kernel.h>
1616
#include <linux/module.h>
17-
#include <linux/of_device.h>
17+
#include <linux/of.h>
18+
#include <linux/of_platform.h>
1819
#include <linux/platform_device.h>
1920
#include <linux/firmware/qcom/qcom_scm.h>
2021
#include <linux/sizes.h>

drivers/soc/qcom/pmic_glink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Copyright (c) 2022, Linaro Ltd
55
*/
66
#include <linux/auxiliary_bus.h>
7-
#include <linux/of_device.h>
87
#include <linux/module.h>
8+
#include <linux/of.h>
99
#include <linux/platform_device.h>
1010
#include <linux/rpmsg.h>
1111
#include <linux/slab.h>

drivers/soc/qcom/pmic_glink_altmode.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <linux/auxiliary_bus.h>
77
#include <linux/bitfield.h>
88
#include <linux/module.h>
9+
#include <linux/of.h>
910
#include <linux/of_device.h>
1011
#include <linux/mutex.h>
1112
#include <linux/property.h>

drivers/soc/qcom/rpmhpd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <linux/pm_domain.h>
1010
#include <linux/slab.h>
1111
#include <linux/of.h>
12-
#include <linux/of_device.h>
1312
#include <linux/platform_device.h>
1413
#include <linux/pm_opp.h>
1514
#include <soc/qcom/cmd-db.h>

drivers/soc/qcom/rpmpd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <linux/mutex.h>
99
#include <linux/pm_domain.h>
1010
#include <linux/of.h>
11-
#include <linux/of_device.h>
1211
#include <linux/platform_device.h>
1312
#include <linux/pm_opp.h>
1413
#include <linux/soc/qcom/smd-rpm.h>

drivers/soc/qcom/spm.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include <linux/module.h>
1313
#include <linux/slab.h>
1414
#include <linux/of.h>
15-
#include <linux/of_address.h>
16-
#include <linux/of_device.h>
1715
#include <linux/err.h>
1816
#include <linux/platform_device.h>
1917
#include <soc/qcom/spm.h>

0 commit comments

Comments
 (0)