diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:57:58 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:57:58 -0400 |
commit | 50436312f47f1fd2bf82c983638fe27ca7e03238 (patch) | |
tree | 744c7c52e266d4c0c8f5feb88f109e5e77dd191e /arch | |
parent | d45d94f672e3c79b0db1e6d76e1638ee521d56c0 (diff) |
of: merge of_node_*_flag() and set_node_proc_entry()
Merge common code between PowerPC and Microblaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 16 | ||||
-rw-r--r-- | arch/powerpc/include/asm/prom.h | 17 |
2 files changed, 0 insertions, 33 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index dfc4afcdbd2b..180d84481306 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -35,24 +35,8 @@ | |||
35 | 35 | ||
36 | extern struct device_node *of_chosen; | 36 | extern struct device_node *of_chosen; |
37 | 37 | ||
38 | static inline int of_node_check_flag(struct device_node *n, unsigned long flag) | ||
39 | { | ||
40 | return test_bit(flag, &n->_flags); | ||
41 | } | ||
42 | |||
43 | static inline void of_node_set_flag(struct device_node *n, unsigned long flag) | ||
44 | { | ||
45 | set_bit(flag, &n->_flags); | ||
46 | } | ||
47 | |||
48 | #define HAVE_ARCH_DEVTREE_FIXUPS | 38 | #define HAVE_ARCH_DEVTREE_FIXUPS |
49 | 39 | ||
50 | static inline void set_node_proc_entry(struct device_node *dn, | ||
51 | struct proc_dir_entry *de) | ||
52 | { | ||
53 | dn->pde = de; | ||
54 | } | ||
55 | |||
56 | extern struct device_node *allnodes; /* temporary while merging */ | 40 | extern struct device_node *allnodes; /* temporary while merging */ |
57 | extern rwlock_t devtree_lock; /* temporary while merging */ | 41 | extern rwlock_t devtree_lock; /* temporary while merging */ |
58 | 42 | ||
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index ef20e6c23235..2cfd43288a3e 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h | |||
@@ -32,25 +32,8 @@ | |||
32 | 32 | ||
33 | extern struct device_node *of_chosen; | 33 | extern struct device_node *of_chosen; |
34 | 34 | ||
35 | static inline int of_node_check_flag(struct device_node *n, unsigned long flag) | ||
36 | { | ||
37 | return test_bit(flag, &n->_flags); | ||
38 | } | ||
39 | |||
40 | static inline void of_node_set_flag(struct device_node *n, unsigned long flag) | ||
41 | { | ||
42 | set_bit(flag, &n->_flags); | ||
43 | } | ||
44 | |||
45 | |||
46 | #define HAVE_ARCH_DEVTREE_FIXUPS | 35 | #define HAVE_ARCH_DEVTREE_FIXUPS |
47 | 36 | ||
48 | static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de) | ||
49 | { | ||
50 | dn->pde = de; | ||
51 | } | ||
52 | |||
53 | |||
54 | extern struct device_node *of_find_all_nodes(struct device_node *prev); | 37 | extern struct device_node *of_find_all_nodes(struct device_node *prev); |
55 | extern struct device_node *of_node_get(struct device_node *node); | 38 | extern struct device_node *of_node_get(struct device_node *node); |
56 | extern void of_node_put(struct device_node *node); | 39 | extern void of_node_put(struct device_node *node); |