[PATCH 06/11] [POWERPC] qe_lib: implement qe_muram_offset
From: Anton Vorontsov <hidden>
Date: 2008-02-03 17:10:24
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
qe_muram_offset is the reverse of the qe_muram_addr. Also, move qe_muram_addr to the qe.h header. Signed-off-by: Anton Vorontsov <redacted> --- arch/powerpc/sysdev/qe_lib/qe.c | 6 ------ include/asm-powerpc/qe.h | 11 ++++++++++- 2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index 5ef844d..0757def 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c@@ -415,12 +415,6 @@ void qe_muram_dump(void) } EXPORT_SYMBOL(qe_muram_dump); -void *qe_muram_addr(unsigned long offset) -{ - return (void *)&qe_immr->muram[offset]; -} -EXPORT_SYMBOL(qe_muram_addr); - /* The maximum number of RISCs we support */ #define MAX_QE_RISC 2
diff --git a/include/asm-powerpc/qe.h b/include/asm-powerpc/qe.h
index 430dc77..df20f73 100644
--- a/include/asm-powerpc/qe.h
+++ b/include/asm-powerpc/qe.h@@ -92,7 +92,16 @@ unsigned long qe_muram_alloc(int size, int align); int qe_muram_free(unsigned long offset); unsigned long qe_muram_alloc_fixed(unsigned long offset, int size); void qe_muram_dump(void); -void *qe_muram_addr(unsigned long offset); + +static inline void *qe_muram_addr(unsigned long offset) +{ + return (void *)&qe_immr->muram[offset]; +} + +static inline unsigned long qe_muram_offset(void *addr) +{ + return addr - (void *)qe_immr->muram; +} /* Structure that defines QE firmware binary files. *
--
1.5.2.2