of: make set_node_proc_entry private to proc_devtree.c (8cfb3343) · Commits · 戴 / test

We only need set_node_proc_entry in proc_devtree.c, so move it there. This fixes the !HAVE_ARCH_DEVTREE_FIXUPS build, as we can't make make the definition in linux/of.h conditional on this #define (definitions in asm/prom.h can't be exposed to linux/of.h, due to the enforced #include ordering). Signed-off-by:

Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:

Grant Likely <grant.likely@secretlab.ca>

fs/proc/proc_devtree.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -14,12 +14,13 @@
		#include <asm/uaccess.h>
		#include "internal.h"

		#ifndef HAVE_ARCH_DEVTREE_FIXUPS
		static inline void set_node_proc_entry(struct device_node *np,
		struct proc_dir_entry *de)
		{
		}
		#ifdef HAVE_ARCH_DEVTREE_FIXUPS
		np->pde = de;
		#endif
		}

		static struct proc_dir_entry *proc_device_tree;

include/linux/of.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -73,12 +73,6 @@ static inline void of_node_set_flag(struct device_node *n, unsigned long flag)
		set_bit(flag, &n->_flags);
		}

		static inline void
		set_node_proc_entry(struct device_node dn, struct proc_dir_entry de)
		{
		dn->pde = de;
		}

		extern struct device_node of_find_all_nodes(struct device_node prev);

		#if defined(CONFIG_SPARC)

Admin message