summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2023-07-14 19:48:13 +0200
committerDave Jiang <dave.jiang@intel.com>2023-07-19 17:45:50 +0200
commitfd774e36fe873632b1e9cf067cea46d7d7df55ac (patch)
treebb6591378365fc2106949e3b1b8e8a01eed27d8b
parentvirtio_pmem: add the missing REQ_OP_WRITE for flush bio (diff)
downloadlinux-fd774e36fe873632b1e9cf067cea46d7d7df55ac.tar.xz
linux-fd774e36fe873632b1e9cf067cea46d7d7df55ac.zip
nvdimm: 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> Signed-off-by: Dave Jiang <dave.jiang@intel.com>
-rw-r--r--drivers/nvdimm/of_pmem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
index 10dbdcdfb9ce..1b9f5b8a6167 100644
--- a/drivers/nvdimm/of_pmem.c
+++ b/drivers/nvdimm/of_pmem.c
@@ -2,11 +2,11 @@
#define pr_fmt(fmt) "of_pmem: " fmt
-#include <linux/of_platform.h>
-#include <linux/of_address.h>
+#include <linux/of.h>
#include <linux/libnvdimm.h>
#include <linux/module.h>
#include <linux/ioport.h>
+#include <linux/platform_device.h>
#include <linux/slab.h>
struct of_pmem_private {