diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:58:00 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:58:00 -0400 |
commit | b6caf2ad7ce30648b89c1cf40d8f7cf6f4b58033 (patch) | |
tree | 014b9f2c763711a52c21540ea49845d0ab497e01 /arch/microblaze/include | |
parent | 50436312f47f1fd2bf82c983638fe27ca7e03238 (diff) |
of: merge of_read_number() an of_read_ulong()
Merge common code between Microblaze and PowerPC
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/microblaze/include')
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 180d84481306..d4f57ffdae3f 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -82,18 +82,6 @@ extern int release_OF_resource(struct device_node *node, int index); | |||
82 | * OF address retreival & translation | 82 | * OF address retreival & translation |
83 | */ | 83 | */ |
84 | 84 | ||
85 | /* Helper to read a big number; size is in cells (not bytes) */ | ||
86 | static inline u64 of_read_number(const u32 *cell, int size) | ||
87 | { | ||
88 | u64 r = 0; | ||
89 | while (size--) | ||
90 | r = (r << 32) | *(cell++); | ||
91 | return r; | ||
92 | } | ||
93 | |||
94 | /* Like of_read_number, but we want an unsigned long result */ | ||
95 | #define of_read_ulong(cell, size) of_read_number(cell, size) | ||
96 | |||
97 | /* Translate an OF address block into a CPU physical address | 85 | /* Translate an OF address block into a CPU physical address |
98 | */ | 86 | */ |
99 | extern u64 of_translate_address(struct device_node *np, const u32 *addr); | 87 | extern u64 of_translate_address(struct device_node *np, const u32 *addr); |