Skip to content

Commit 0b48387

Browse files
robherringkrzk
authored andcommitted
memory: 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]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent 6e1547f commit 0b48387

15 files changed

+16
-15
lines changed

drivers/memory/brcmstb_dpfe.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
#include <linux/firmware.h>
3333
#include <linux/io.h>
3434
#include <linux/module.h>
35-
#include <linux/of_address.h>
36-
#include <linux/of_device.h>
35+
#include <linux/of.h>
3736
#include <linux/platform_device.h>
3837

3938
#define DRVNAME "brcmstb-dpfe"

drivers/memory/da8xx-ddrctl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <linux/module.h>
1212
#include <linux/of.h>
13-
#include <linux/of_device.h>
1413
#include <linux/platform_device.h>
1514
#include <linux/io.h>
1615

drivers/memory/fsl_ifc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/slab.h>
1616
#include <linux/io.h>
1717
#include <linux/of.h>
18-
#include <linux/of_device.h>
18+
#include <linux/of_platform.h>
1919
#include <linux/platform_device.h>
2020
#include <linux/fsl_ifc.h>
2121
#include <linux/irqdomain.h>

drivers/memory/jz4780-nemc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <linux/math64.h>
1313
#include <linux/of.h>
1414
#include <linux/of_address.h>
15-
#include <linux/of_device.h>
1615
#include <linux/of_platform.h>
1716
#include <linux/platform_device.h>
1817
#include <linux/slab.h>

drivers/memory/pl353-smc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/clk.h>
1111
#include <linux/kernel.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/amba/bus.h>

drivers/memory/renesas-rpc-if.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/platform_device.h>
1515
#include <linux/of.h>
16-
#include <linux/of_device.h>
1716
#include <linux/regmap.h>
1817
#include <linux/reset.h>
1918

drivers/memory/samsung/exynos5422-dmc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/mfd/syscon.h>
1414
#include <linux/module.h>
1515
#include <linux/moduleparam.h>
16-
#include <linux/of_device.h>
16+
#include <linux/of.h>
1717
#include <linux/pm_opp.h>
1818
#include <linux/platform_device.h>
1919
#include <linux/regmap.h>

drivers/memory/stm32-fmc2-ebi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
#include <linux/clk.h>
88
#include <linux/mfd/syscon.h>
99
#include <linux/module.h>
10+
#include <linux/of.h>
1011
#include <linux/of_platform.h>
1112
#include <linux/pinctrl/consumer.h>
13+
#include <linux/platform_device.h>
1214
#include <linux/regmap.h>
1315
#include <linux/reset.h>
1416

drivers/memory/tegra/mc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <linux/kernel.h>
1212
#include <linux/module.h>
1313
#include <linux/of.h>
14-
#include <linux/of_device.h>
14+
#include <linux/of_platform.h>
1515
#include <linux/platform_device.h>
1616
#include <linux/slab.h>
1717
#include <linux/sort.h>

drivers/memory/tegra/tegra124.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
#include <linux/of.h>
7-
#include <linux/of_device.h>
7+
#include <linux/device.h>
88
#include <linux/slab.h>
99

1010
#include <dt-bindings/memory/tegra124-mc.h>

0 commit comments

Comments
 (0)