forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

of: make set_node_proc_entry private to proc_devtree.c

Browse source 
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>
This commit is contained in:
Jeremy Kerr 2010-02-01 21:34:14 -07:00 • committed by Grant Likely
commit 8cfb3343f7
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fs/proc/proc_devtree.c
View file

@ -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;

6
include/linux/of.h
View file

@ -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)