[POWERPC] cpm2: Infrastructure code cleanup.

Mostly sparse fixes (__iomem annotations, etc); also, cpm2_immr
is used rather than creating many temporary mappings.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

1 files changed, 3 insertions, 16 deletions

diff --git a/include/asm-powerpc/fs_pd.h b/include/asm-powerpc/fs_pd.h
index 77e04d01749c..64706a0532d3 100644
--- a/include/asm-powerpc/fs_pd.h
+++ b/include/asm-powerpc/fs_pd.h
@@ -23,22 +23,9 @@
 #include <asm/mpc85xx.h>
 #endif
 
-#define cpm2_map(member)                                                \
-({                                                                      \
-        u32 offset = offsetof(cpm2_map_t, member);                      \
-        void *addr = ioremap (CPM_MAP_ADDR + offset,                    \
-                              sizeof( ((cpm2_map_t*)0)->member));       \
-        addr;                                                           \
-})
-
-#define cpm2_map_size(member, size)                                     \
-({                                                                      \
-        u32 offset = offsetof(cpm2_map_t, member);                      \
-        void *addr = ioremap (CPM_MAP_ADDR + offset, size);             \
-        addr;                                                           \
-})
-
-#define cpm2_unmap(addr)        iounmap(addr)
+#define cpm2_map(member) (&cpm2_immr->member)
+#define cpm2_map_size(member, size) (&cpm2_immr->member)
+#define cpm2_unmap(addr) do {} while(0)
 #endif
 
 #ifdef CONFIG_8xx