OF: move extern declarations of entry pointers inside ifdef

Message ID 20170825150027.25341-1-Eugeniy.Paltsev@synopsys.com
State New
Headers show

Commit Message

Eugeniy Paltsev Aug. 25, 2017, 3 p.m.
Move extern declarations of "of_root", "of_chosen", "of_aliases",
"of_stdout" pointers inside "CONFIG_OF" ifdef to be able to get rid
of "CONFIG_OF" ifdef in their usage places.

Suggested-by: Steven Rostedt <rostedt@goodmis.org>

Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
---
For example see: https://lkml.org/lkml/2017/8/25/337

 include/linux/of.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Comments

Steven Rostedt Aug. 25, 2017, 3:12 p.m. | #1
On Fri, 25 Aug 2017 18:00:26 +0300
Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> wrote:

> Move extern declarations of "of_root", "of_chosen", "of_aliases",
> "of_stdout" pointers inside "CONFIG_OF" ifdef to be able to get rid
> of "CONFIG_OF" ifdef in their usage places.
> 
> Suggested-by: Steven Rostedt <rostedt@goodmis.org>

Thanks!

-- Steve

> 
> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
> ---
Eugeniy Paltsev Aug. 25, 2017, 3:20 p.m. | #2
On Fri, 2017-08-25 at 11:12 -0400, Steven Rostedt wrote:
> On Fri, 25 Aug 2017 18:00:26 +0300

> Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> wrote:

> 

> > Move extern declarations of "of_root", "of_chosen", "of_aliases",

> > "of_stdout" pointers inside "CONFIG_OF" ifdef to be able to get rid

> > of "CONFIG_OF" ifdef in their usage places.

> > 

> > Suggested-by: Steven Rostedt <rostedt@goodmis.org>

> 

> Thanks!

> -- Steve


Could you please ACK my patch if it looks good for you?
Thanks.

> > 

> > Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>

> > ---

-- 
 Eugeniy Paltsev
Steven Rostedt Aug. 25, 2017, 3:25 p.m. | #3
On Fri, 25 Aug 2017 15:20:12 +0000
Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> wrote:

> On Fri, 2017-08-25 at 11:12 -0400, Steven Rostedt wrote:
> > On Fri, 25 Aug 2017 18:00:26 +0300
> > Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> wrote:
> >   
> > > Move extern declarations of "of_root", "of_chosen", "of_aliases",
> > > "of_stdout" pointers inside "CONFIG_OF" ifdef to be able to get rid
> > > of "CONFIG_OF" ifdef in their usage places.
> > > 
> > > Suggested-by: Steven Rostedt <rostedt@goodmis.org>  
> > 
> > Thanks!
> > -- Steve  
> 
> Could you please ACK my patch if it looks good for you?
> Thanks.

I could, but ACKs are usually for the maintainer of the code being
changed. I don't maintain include/linux/of.h

But for what it's worth...

Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve
Rob Herring Aug. 25, 2017, 3:43 p.m. | #4
On Fri, Aug 25, 2017 at 10:00 AM, Eugeniy Paltsev
<Eugeniy.Paltsev@synopsys.com> wrote:
> Move extern declarations of "of_root", "of_chosen", "of_aliases",
> "of_stdout" pointers inside "CONFIG_OF" ifdef to be able to get rid
> of "CONFIG_OF" ifdef in their usage places.
>
> Suggested-by: Steven Rostedt <rostedt@goodmis.org>
>
> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
> ---
> For example see: https://lkml.org/lkml/2017/8/25/337
>
>  include/linux/of.h | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/include/linux/of.h b/include/linux/of.h
> index cfc3411..d117bf1 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -131,11 +131,6 @@ static inline struct device_node *of_node_get(struct device_node *node)
>  static inline void of_node_put(struct device_node *node) { }
>  #endif /* !CONFIG_OF_DYNAMIC */
>
> -/* Pointer for first entry in chain of all nodes. */
> -extern struct device_node *of_root;
> -extern struct device_node *of_chosen;
> -extern struct device_node *of_aliases;
> -extern struct device_node *of_stdout;

Just move what you need. Some of these I'd like to see be internal to
the DT code.

Rob

Patch

diff --git a/include/linux/of.h b/include/linux/of.h
index cfc3411..d117bf1 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -131,11 +131,6 @@  static inline struct device_node *of_node_get(struct device_node *node)
 static inline void of_node_put(struct device_node *node) { }
 #endif /* !CONFIG_OF_DYNAMIC */
 
-/* Pointer for first entry in chain of all nodes. */
-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;
 
 /* flag descriptions (need to be visible even when !CONFIG_OF) */
@@ -147,6 +142,12 @@  extern raw_spinlock_t devtree_lock;
 #define OF_BAD_ADDR	((u64)-1)
 
 #ifdef CONFIG_OF
+/* Pointer for first entry in chain of all nodes. */
+extern struct device_node *of_root;
+extern struct device_node *of_chosen;
+extern struct device_node *of_aliases;
+extern struct device_node *of_stdout;
+
 void of_core_init(void);
 
 static inline bool is_of_node(const struct fwnode_handle *fwnode)
@@ -539,6 +540,10 @@  const char *of_prop_next_string(struct property *prop, const char *cur);
 bool of_console_check(struct device_node *dn, char *name, int index);
 
 #else /* CONFIG_OF */
+#define of_root		NULL
+#define of_chosen	NULL
+#define of_aliases	NULL
+#define of_stdout	NULL
 
 static inline void of_core_init(void)
 {