diff options
| author | Rob Herring <robh@kernel.org> | 2023-03-29 18:51:58 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2023-04-11 02:32:31 +0300 |
| commit | 1dd5474ee6ee1d6ddc95f1423966ab8d4afda448 (patch) | |
| tree | a7bca149f32d8c39bcc659ef184a6daccef13b7d | |
| parent | c12cc1bc7d70f0efa46e5afad5775daef2f4cc81 (diff) | |
| download | linux-1dd5474ee6ee1d6ddc95f1423966ab8d4afda448.tar.xz | |
of: Make devtree_lock declaration private
Sparc is the only place devtree_lock is used outside of drivers/of/.
Move the devtree_lock declaration into of_private.h and Sparc's prom.h
so pulling in spinlock.h to of.h can be avoided for everything besides
Sparc.
Link: https://lore.kernel.org/r/20230329-dt-cpu-header-cleanups-v1-1-581e2605fe47@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | arch/sparc/include/asm/prom.h | 3 | ||||
| -rw-r--r-- | drivers/of/of_private.h | 1 | ||||
| -rw-r--r-- | include/linux/of.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h index 587edb8b5a65..8184575b1336 100644 --- a/arch/sparc/include/asm/prom.h +++ b/arch/sparc/include/asm/prom.h @@ -19,11 +19,14 @@ #include <linux/mutex.h> #include <linux/atomic.h> #include <linux/irqdomain.h> +#include <linux/spinlock.h> #define of_compat_cmp(s1, s2, l) strncmp((s1), (s2), (l)) #define of_prop_cmp(s1, s2) strcasecmp((s1), (s2)) #define of_node_cmp(s1, s2) strcmp((s1), (s2)) +extern raw_spinlock_t devtree_lock; + struct of_irq_controller { unsigned int (*irq_build)(struct device_node *, unsigned int, void *); void *data; diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index fb6792d381a6..b57f1014e419 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -38,6 +38,7 @@ struct alias_prop { #define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1 extern struct mutex of_mutex; +extern raw_spinlock_t devtree_lock; extern struct list_head aliases_lookup; extern struct kset *of_kset; diff --git a/include/linux/of.h b/include/linux/of.h index 0af611307db2..36cf94596eba 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -16,7 +16,6 @@ #include <linux/errno.h> #include <linux/kobject.h> #include <linux/mod_devicetable.h> -#include <linux/spinlock.h> #include <linux/topology.h> #include <linux/notifier.h> #include <linux/property.h> @@ -145,7 +144,6 @@ extern struct device_node *of_root; extern struct device_node *of_chosen; extern struct device_node *of_aliases; extern struct device_node *of_stdout; -extern raw_spinlock_t devtree_lock; /* * struct device_node flag descriptions |