Skip to content

Commit 9bf75da

Browse files
robherringgregkh
authored andcommitted
nvmem: 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]> Signed-off-by: Srinivas Kandagatla <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0861110 commit 9bf75da

16 files changed

+9
-16
lines changed

drivers/nvmem/bcm-ocotp.c

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

1413
/*

drivers/nvmem/core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <linux/nvmem-provider.h>
1818
#include <linux/gpio/consumer.h>
1919
#include <linux/of.h>
20-
#include <linux/of_device.h>
2120
#include <linux/slab.h>
2221

2322
struct nvmem_device {

drivers/nvmem/imx-iim.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/module.h>
1515
#include <linux/nvmem-provider.h>
1616
#include <linux/of.h>
17-
#include <linux/of_device.h>
1817
#include <linux/platform_device.h>
1918
#include <linux/slab.h>
2019
#include <linux/clk.h>

drivers/nvmem/imx-ocotp-ele.c

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

drivers/nvmem/imx-ocotp-scu.c

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

drivers/nvmem/imx-ocotp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <linux/module.h>
2121
#include <linux/nvmem-provider.h>
2222
#include <linux/of.h>
23-
#include <linux/of_device.h>
2423
#include <linux/platform_device.h>
2524
#include <linux/slab.h>
2625
#include <linux/delay.h>

drivers/nvmem/lpc18xx_otp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/module.h>
1515
#include <linux/nvmem-provider.h>
1616
#include <linux/of.h>
17-
#include <linux/of_device.h>
1817
#include <linux/platform_device.h>
1918
#include <linux/slab.h>
2019

drivers/nvmem/meson-mx-efuse.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/module.h>
1515
#include <linux/nvmem-provider.h>
1616
#include <linux/of.h>
17-
#include <linux/of_device.h>
1817
#include <linux/platform_device.h>
1918
#include <linux/sizes.h>
2019
#include <linux/slab.h>

drivers/nvmem/qcom-spmi-sdam.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include <linux/device.h>
77
#include <linux/module.h>
88
#include <linux/of.h>
9-
#include <linux/of_platform.h>
109
#include <linux/nvmem-provider.h>
10+
#include <linux/platform_device.h>
1111
#include <linux/regmap.h>
1212

1313
#define SDAM_MEM_START 0x40

drivers/nvmem/rave-sp-eeprom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/mfd/rave-sp.h>
1111
#include <linux/module.h>
1212
#include <linux/nvmem-provider.h>
13-
#include <linux/of_device.h>
13+
#include <linux/of.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/sizes.h>
1616

0 commit comments

Comments
 (0)