summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2023-07-14 11:47:54 -0600
committerRob Herring <robh@kernel.org>2023-08-28 13:36:24 -0500
commit9ac21f40c7e2524e4bc0774e7e2255e0cbe161df (patch)
tree190dfc601de6b77578e2f44e00a55178b29f565a
parent233d687d1b78080ee79f67356327e0e0e50ef6f5 (diff)
downloadlinux-9ac21f40c7e2524e4bc0774e7e2255e0cbe161df.tar.gz
linux-9ac21f40c7e2524e4bc0774e7e2255e0cbe161df.tar.xz
mux: 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 was 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. Link: https://lore.kernel.org/r/20230714174754.4060608-1-robh@kernel.org Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r--drivers/mux/core.c1
-rw-r--r--drivers/mux/mmio.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mux/core.c b/drivers/mux/core.c
index 990e7bc17c85..775816112932 100644
--- a/drivers/mux/core.c
+++ b/drivers/mux/core.c
@@ -19,7 +19,6 @@
#include <linux/mux/consumer.h>
#include <linux/mux/driver.h>
#include <linux/of.h>
-#include <linux/of_platform.h>
#include <linux/slab.h>
/*
diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
index 245bc07eee4b..fd1d121a584b 100644
--- a/drivers/mux/mmio.c
+++ b/drivers/mux/mmio.c
@@ -10,7 +10,7 @@
#include <linux/mfd/syscon.h>
#include <linux/module.h>
#include <linux/mux/driver.h>
-#include <linux/of_platform.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/regmap.h>